Skip to content
Snippets Groups Projects
Commit d2e5b7ca authored by Josh Bell's avatar Josh Bell
Browse files

svn merge -r 81720:82231...

parent 618e625a
No related branches found
No related tags found
No related merge requests found
...@@ -533,6 +533,9 @@ ...@@ -533,6 +533,9 @@
<key>ParcelPropertiesUpdate</key> <key>ParcelPropertiesUpdate</key>
<boolean>false</boolean> <boolean>false</boolean>
<key>EstateChangeInfo</key>
<boolean>false</boolean>
</map> </map>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 19; const S32 LL_VERSION_MINOR = 19;
const S32 LL_VERSION_PATCH = 1; 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"; const char * const LL_CHANNEL = "Second Life Server";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment