aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/JsonStore
diff options
context:
space:
mode:
authorMelanie2013-05-30 21:48:09 +0100
committerMelanie2013-05-30 21:48:09 +0100
commit669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/OptionalModules/Scripting/JsonStore
parentMerge branch 'master' into careminster (diff)
parentTry caching the user name for a new agent earlier on in the process of establ... (diff)
downloadopensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip
opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz
opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2
opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/JsonStore')
0 files changed, 0 insertions, 0 deletions