From fa121d8ee18978ffc25e9faeffcfa1d7c6e1592e Mon Sep 17 00:00:00 2001 From: Robert Knop Date: Thu, 9 Apr 2009 00:20:15 +0000 Subject: svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging from server-1.26 to trunk Only a few conflicts: scripts/farm_distribute : the upload rate in trunk was even more conservative than the one I switched to in 1.26, so kept the trunk version. indra/llcommon/llversionserver.h : did svn revert to keep trunk indra/newsim/lltask.cpp : svn is weird. The merge conflict was one that it's not obvious why it was there. However, Simon and I looked at it, and the solution was obvious : keep the trunk blob where the conflict was flagged. indra/lib/python : conflict was differing versions of the eventlib extern. did svn revert . to keep trunk. --- indra/llcommon/llversionserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/llversionserver.h') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index f9b84dd6bd..f191f8b4f5 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 27; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 112940; +const S32 LL_VERSION_BUILD = 116936; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.3