aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-12 22:23:24 +0100
committerJustin Clark-Casey (justincc)2014-05-12 22:23:24 +0100
commit8457044b2f46e477442e3dec520c9a47ca20dd6b (patch)
tree8f8691a349948c15e4fe66a17e01bc3d0a1154c4
parentminor: eliminate unused UUID in xmlrpc GroupsMessagingModule.ProcessMessageFr... (diff)
downloadopensim-SC_OLD-8457044b2f46e477442e3dec520c9a47ca20dd6b.zip
opensim-SC_OLD-8457044b2f46e477442e3dec520c9a47ca20dd6b.tar.gz
opensim-SC_OLD-8457044b2f46e477442e3dec520c9a47ca20dd6b.tar.bz2
opensim-SC_OLD-8457044b2f46e477442e3dec520c9a47ca20dd6b.tar.xz
Eliminate subsequently unused scene finding in UndeliveredMessage() method of xmlrpc and core offline IM modules
-rw-r--r--OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs4
2 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
index 5ef068a..950e1fd 100644
--- a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
+++ b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
@@ -226,10 +226,6 @@ namespace OpenSim.OfflineIM
226 return; 226 return;
227 } 227 }
228 228
229 Scene scene = FindScene(new UUID(im.fromAgentID));
230 if (scene == null)
231 scene = m_SceneList[0];
232
233 string reason = string.Empty; 229 string reason = string.Empty;
234 bool success = m_OfflineIMService.StoreMessage(im, out reason); 230 bool success = m_OfflineIMService.StoreMessage(im, out reason);
235 231
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 7f3d0a2..bd2b2fe 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -226,10 +226,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
226 return; 226 return;
227 } 227 }
228 228
229 Scene scene = FindScene(new UUID(im.fromAgentID));
230 if (scene == null)
231 scene = m_SceneList[0];
232
233 bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( 229 bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
234 "POST", m_RestURL+"/SaveMessage/", im); 230 "POST", m_RestURL+"/SaveMessage/", im);
235 231