aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorMelanie2011-11-19 22:39:15 +0000
committerMelanie2011-11-19 22:39:15 +0000
commitbdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch)
treefe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentMerge branch 'master' into bigmerge (diff)
parentRemove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff)
downloadopensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip
opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz
opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2
opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-09 06:13:34 +0000