diff options
author | Teravus Ovares | 2007-11-26 05:02:18 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-26 05:02:18 +0000 |
commit | 175b6115f19f9bad7c81fde625250b3a7f8a33f2 (patch) | |
tree | f907f3b409eca34017f6e18dcf4d644b623d0302 /OpenSim/Region/Environment/Scenes/SceneManager.cs | |
parent | Added Region name to the terrain texture description that gets sent to the as... (diff) | |
download | opensim-SC_OLD-175b6115f19f9bad7c81fde625250b3a7f8a33f2.zip opensim-SC_OLD-175b6115f19f9bad7c81fde625250b3a7f8a33f2.tar.gz opensim-SC_OLD-175b6115f19f9bad7c81fde625250b3a7f8a33f2.tar.bz2 opensim-SC_OLD-175b6115f19f9bad7c81fde625250b3a7f8a33f2.tar.xz |
* Restarting regions with the estate tools works in sandbox mode. I'm still working on grid mode, however. It doesn't break anything, but that feature doesn't work in grid mode yet either.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 4360d97..c28269e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -121,17 +121,35 @@ namespace OpenSim.Region.Environment.Scenes | |||
121 | 121 | ||
122 | public void SendSimOnlineNotification(ulong regionHandle) | 122 | public void SendSimOnlineNotification(ulong regionHandle) |
123 | { | 123 | { |
124 | RegionInfo Result = null; | ||
124 | 125 | ||
125 | for (int i = 0; i < m_localScenes.Count; i++) | 126 | for (int i = 0; i < m_localScenes.Count; i++) |
126 | { | 127 | { |
127 | if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle) | 128 | |
129 | if (m_localScenes[i].RegionInfo.RegionHandle == regionHandle) | ||
128 | { | 130 | { |
131 | |||
129 | // Inform other regions to tell their avatar about me | 132 | // Inform other regions to tell their avatar about me |
130 | m_localScenes[i].OtherRegionUp(m_localScenes[i].RegionInfo); | 133 | Result = m_localScenes[i].RegionInfo; |
131 | } | 134 | } |
132 | } | 135 | } |
136 | if (!(Result.Equals(null))) | ||
137 | { | ||
138 | for (int i = 0; i < m_localScenes.Count; i++) | ||
139 | { | ||
133 | 140 | ||
141 | if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle) | ||
142 | { | ||
134 | 143 | ||
144 | // Inform other regions to tell their avatar about me | ||
145 | //m_localScenes[i].OtherRegionUp(Result); | ||
146 | } | ||
147 | } | ||
148 | } | ||
149 | else | ||
150 | { | ||
151 | MainLog.Instance.Error("REGION", "Unable to notify Other regions of this Region coming up"); | ||
152 | } | ||
135 | } | 153 | } |
136 | public void SaveCurrentSceneToXml(string filename) | 154 | public void SaveCurrentSceneToXml(string filename) |
137 | { | 155 | { |