diff options
author | Justin Clark-Casey (justincc) | 2011-08-06 01:15:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-06 01:15:49 +0100 |
commit | 76f46b25454c0c9376130a59cc1b766c0d105dd0 (patch) | |
tree | 549495272eb759fb8f90027230888fce2ff0d714 /OpenSim/Services | |
parent | rename TestHelper => TestHelpers for consistency (diff) | |
download | opensim-SC_OLD-76f46b25454c0c9376130a59cc1b766c0d105dd0.zip opensim-SC_OLD-76f46b25454c0c9376130a59cc1b766c0d105dd0.tar.gz opensim-SC_OLD-76f46b25454c0c9376130a59cc1b766c0d105dd0.tar.bz2 opensim-SC_OLD-76f46b25454c0c9376130a59cc1b766c0d105dd0.tar.xz |
Do proper locking of m_localScenes list in SceneManager
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInstantMessageService.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index bb31fc9..0d59636 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -95,7 +95,6 @@ namespace OpenSim.Services.HypergridService | |||
95 | m_InGatekeeper = serverConfig.GetBoolean("InGatekeeper", false); | 95 | m_InGatekeeper = serverConfig.GetBoolean("InGatekeeper", false); |
96 | m_log.DebugFormat("[HG IM SERVICE]: Starting... InRobust? {0}", m_InGatekeeper); | 96 | m_log.DebugFormat("[HG IM SERVICE]: Starting... InRobust? {0}", m_InGatekeeper); |
97 | 97 | ||
98 | |||
99 | if (gridService == string.Empty || presenceService == string.Empty) | 98 | if (gridService == string.Empty || presenceService == string.Empty) |
100 | throw new Exception(String.Format("Incomplete specifications, InstantMessage Service cannot function.")); | 99 | throw new Exception(String.Format("Incomplete specifications, InstantMessage Service cannot function.")); |
101 | 100 | ||
@@ -120,7 +119,7 @@ namespace OpenSim.Services.HypergridService | |||
120 | 119 | ||
121 | public bool IncomingInstantMessage(GridInstantMessage im) | 120 | public bool IncomingInstantMessage(GridInstantMessage im) |
122 | { | 121 | { |
123 | m_log.DebugFormat("[HG IM SERVICE]: Received message from {0} to {1}", im.fromAgentID, im.toAgentID); | 122 | // m_log.DebugFormat("[HG IM SERVICE]: Received message from {0} to {1}", im.fromAgentID, im.toAgentID); |
124 | UUID toAgentID = new UUID(im.toAgentID); | 123 | UUID toAgentID = new UUID(im.toAgentID); |
125 | 124 | ||
126 | bool success = false; | 125 | bool success = false; |
@@ -142,7 +141,7 @@ namespace OpenSim.Services.HypergridService | |||
142 | 141 | ||
143 | public bool OutgoingInstantMessage(GridInstantMessage im, string url, bool foreigner) | 142 | public bool OutgoingInstantMessage(GridInstantMessage im, string url, bool foreigner) |
144 | { | 143 | { |
145 | m_log.DebugFormat("[HG IM SERVICE]: Sending message from {0} to {1}@{2}", im.fromAgentID, im.toAgentID, url); | 144 | // m_log.DebugFormat("[HG IM SERVICE]: Sending message from {0} to {1}@{2}", im.fromAgentID, im.toAgentID, url); |
146 | if (url != string.Empty) | 145 | if (url != string.Empty) |
147 | return TrySendInstantMessage(im, url, true, foreigner); | 146 | return TrySendInstantMessage(im, url, true, foreigner); |
148 | else | 147 | else |
@@ -333,7 +332,7 @@ namespace OpenSim.Services.HypergridService | |||
333 | if (m_RestURL != string.Empty && (im.offline != 0) | 332 | if (m_RestURL != string.Empty && (im.offline != 0) |
334 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | 333 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) |
335 | { | 334 | { |
336 | m_log.DebugFormat("[HG IM SERVICE]: Message saved"); | 335 | // m_log.DebugFormat("[HG IM SERVICE]: Message saved"); |
337 | 336 | ||
338 | return SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( | 337 | return SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( |
339 | "POST", m_RestURL + "/SaveMessage/", im); | 338 | "POST", m_RestURL + "/SaveMessage/", im); |