aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/Resources
diff options
context:
space:
mode:
authorMelanie2013-03-29 01:50:34 +0000
committerMelanie2013-03-29 01:50:34 +0000
commit120903efb66f30ba5d009ceed7203a5589e2ff80 (patch)
treeff3a3e697464cfc96d95df2a5c822ca3ee30529b /OpenSim/Region/RegionCombinerModule/Resources
parentMerge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster (diff)
parentMove the simulator-side RezAttachments call on login to SP.MakeRootAgent with... (diff)
downloadopensim-SC-120903efb66f30ba5d009ceed7203a5589e2ff80.zip
opensim-SC-120903efb66f30ba5d009ceed7203a5589e2ff80.tar.gz
opensim-SC-120903efb66f30ba5d009ceed7203a5589e2ff80.tar.bz2
opensim-SC-120903efb66f30ba5d009ceed7203a5589e2ff80.tar.xz
Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/Resources')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-17 20:44:54 +0000