aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-07 18:36:27 +0000
committerJustin Clarke Casey2009-01-07 18:36:27 +0000
commita9df572c257885e578aabd34a2ad8961228c28ad (patch)
tree5ee56f172e0fb0ec96081782f25bf0b4a9baff3e /OpenSim
parentThank you kindly, StrawberryFride for a patch that: (diff)
downloadopensim-SC_OLD-a9df572c257885e578aabd34a2ad8961228c28ad.zip
opensim-SC_OLD-a9df572c257885e578aabd34a2ad8961228c28ad.tar.gz
opensim-SC_OLD-a9df572c257885e578aabd34a2ad8961228c28ad.tar.bz2
opensim-SC_OLD-a9df572c257885e578aabd34a2ad8961228c28ad.tar.xz
* refactor: Remove MakeHttpRequest wrapper method from Scene in favour of a direct call
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs18
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3bf6cef..9a07f6b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -141,7 +141,6 @@ namespace OpenSim.Region.Environment.Scenes
141 141
142 public IXfer XferManager; 142 public IXfer XferManager;
143 143
144 protected IHttpRequests m_httpRequestModule;
145 protected IXMLRPC m_xmlrpcModule; 144 protected IXMLRPC m_xmlrpcModule;
146 protected IWorldComm m_worldCommModule; 145 protected IWorldComm m_worldCommModule;
147 protected IAvatarFactory m_AvatarFactory; 146 protected IAvatarFactory m_AvatarFactory;
@@ -766,7 +765,6 @@ namespace OpenSim.Region.Environment.Scenes
766 /// </summary> 765 /// </summary>
767 public void SetModuleInterfaces() 766 public void SetModuleInterfaces()
768 { 767 {
769 m_httpRequestModule = RequestModuleInterface<IHttpRequests>();
770 m_xmlrpcModule = RequestModuleInterface<IXMLRPC>(); 768 m_xmlrpcModule = RequestModuleInterface<IXMLRPC>();
771 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 769 m_worldCommModule = RequestModuleInterface<IWorldComm>();
772 XferManager = RequestModuleInterface<IXfer>(); 770 XferManager = RequestModuleInterface<IXfer>();
@@ -3387,22 +3385,6 @@ namespace OpenSim.Region.Environment.Scenes
3387 } 3385 }
3388 } 3386 }
3389 3387
3390 /// <summary>
3391 ///
3392 /// </summary>
3393 /// <param name="url"></param>
3394 /// <param name="type"></param>
3395 /// <param name="body"></param>
3396 /// <returns></returns>
3397 public UUID MakeHttpRequest(string url, string type, string body)
3398 {
3399 if (m_httpRequestModule != null)
3400 {
3401 return m_httpRequestModule.MakeHttpRequest(url, type, body);
3402 }
3403 return UUID.Zero;
3404 }
3405
3406 public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms) 3388 public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms)
3407 { 3389 {
3408 m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms); 3390 m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);