aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-27 17:01:30 -0700
committerDiva Canto2009-09-27 17:01:30 -0700
commite15a9b848413115644d3a6dd920e146b9589b639 (patch)
treee0ecae776dcccc90373ae649ed6c7e0b47684df7
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-e15a9b848413115644d3a6dd920e146b9589b639.zip
opensim-SC-e15a9b848413115644d3a6dd920e146b9589b639.tar.gz
opensim-SC-e15a9b848413115644d3a6dd920e146b9589b639.tar.bz2
opensim-SC-e15a9b848413115644d3a6dd920e146b9589b639.tar.xz
Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing the notifications of the messaging service in standalone.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index 5a9b452..ad05bab 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -330,9 +330,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
330 330
331 private void NotifyMessageServerOfStartup(Scene scene) 331 private void NotifyMessageServerOfStartup(Scene scene)
332 { 332 {
333 if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
334 return;
335
336 Hashtable xmlrpcdata = new Hashtable(); 333 Hashtable xmlrpcdata = new Hashtable();
337 xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); 334 xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
338 ArrayList SendParams = new ArrayList(); 335 ArrayList SendParams = new ArrayList();