diff options
author | BlueWall | 2012-10-19 07:46:00 -0400 |
---|---|---|
committer | BlueWall | 2012-10-19 07:46:00 -0400 |
commit | 276600ab71a44987ede0bef243cd6ae82c08055d (patch) | |
tree | 344f486f78b95193353a072152836d882e87ab45 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Move PluginManager (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.zip opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.tar.gz opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.tar.bz2 opensim-SC-276600ab71a44987ede0bef243cd6ae82c08055d.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e6b8c16..671feda 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2139,7 +2139,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2139 | public bool AddRestoredSceneObject( | 2139 | public bool AddRestoredSceneObject( |
2140 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) | 2140 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) |
2141 | { | 2141 | { |
2142 | return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); | 2142 | if (m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates)) |
2143 | { | ||
2144 | EventManager.TriggerObjectAddedToScene(sceneObject); | ||
2145 | return true; | ||
2146 | } | ||
2147 | |||
2148 | return false; | ||
2149 | |||
2143 | } | 2150 | } |
2144 | 2151 | ||
2145 | /// <summary> | 2152 | /// <summary> |