aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
diff options
context:
space:
mode:
authorMelanie2011-10-11 21:28:23 +0100
committerMelanie2011-10-11 21:28:23 +0100
commit8fac7c065088d9861ba2ff772fde7f2e9c8d1003 (patch)
tree715c078c3a0ad1298b6b560cf31c2d445c22700a /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parentMerge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge (diff)
parentCorrectly create a freshly created estate owner's default items and avatar en... (diff)
downloadopensim-SC-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.zip
opensim-SC-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.gz
opensim-SC-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.bz2
opensim-SC-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.xz
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-25 22:15:59 +0000