[sldev] Current OS trunk not well-suited for use against 1.25

Kent Quirk (Q Linden) q at lindenlab.com
Mon Apr 13 16:25:34 PDT 2009


I need to warn anyone who's tracking trunk that we had a bit of a  
funky merge issue -- some stuff that's dependent on the 1.26 server  
got merged into trunk last week, but 1.26 isn't live on the grid yet.  
In particular, some of the search and some of the code relating to the  
Adults-only changes won't operate properly until 1.26 gets rolled out.

This was a process failure for which I'll take most of the blame. To  
make testing simpler during a transition, I was developing viewer code  
in the server branch while we waited for an official  viewer branch.  
That code was then migrated to a viewer branch, but I failed to remove  
it from the server branch, and it got merged to trunk.

This means that the viewer-side changes that have made it to trunk are  
incomplete and probably buggy. It's probably best to just ignore trunk  
for a few days until we get this straightened out. Sorry about that.

	Q



More information about the SLDev mailing list