diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-13 16:54:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-13 16:54:05 +0000 |
| commit | d2e5b7ca858b3da99bb6380b3da315c5191935d0 (patch) | |
| tree | 75d169588001508fe35fd9970f12e3d89ca8ff0f | |
| parent | 618e625ad9e20c6f68323c594760233832ece9c7 (diff) | |
svn merge -r 81720:82231 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
| -rw-r--r-- | etc/message.xml | 3 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/message.xml b/etc/message.xml index bfbf1b15be..1335e9711d 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -533,6 +533,9 @@ <key>ParcelPropertiesUpdate</key> <boolean>false</boolean> + + <key>EstateChangeInfo</key> + <boolean>false</boolean> </map> diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index c57830e936..9c34852031 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 19; const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 81484; +const S32 LL_VERSION_BUILD = 81992; const char * const LL_CHANNEL = "Second Life Server"; |