aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 14:20:54 +0000
committerJustin Clarke Casey2009-01-06 14:20:54 +0000
commit2a4c4ceebb6bf9d3349a2f4fbefd84e4748a78a0 (patch)
treef3fdf4853dbae10cf6cf61824e177e8cb963f097 /OpenSim
parent* Mjnor: Clarified comment to ensure that people are aware of how to end the ... (diff)
downloadopensim-SC_OLD-2a4c4ceebb6bf9d3349a2f4fbefd84e4748a78a0.zip
opensim-SC_OLD-2a4c4ceebb6bf9d3349a2f4fbefd84e4748a78a0.tar.gz
opensim-SC_OLD-2a4c4ceebb6bf9d3349a2f4fbefd84e4748a78a0.tar.bz2
opensim-SC_OLD-2a4c4ceebb6bf9d3349a2f4fbefd84e4748a78a0.tar.xz
* refactor: drop AddXmlRpcHandler() from scene in favour of call via CommsManager
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs18
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
4 files changed, 14 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index f87e2dd..3071026 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -32,15 +32,16 @@ using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection; 33using System.Reflection;
34using System.Xml; 34using System.Xml;
35using OpenMetaverse;
36using log4net; 35using log4net;
37using Nini.Config; 36using Nini.Config;
38using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenMetaverse;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Environment.Interfaces;
41using OpenSim.Region.Interfaces; 43using OpenSim.Region.Interfaces;
42using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Environment.Scenes;
43using OpenSim.Framework.Communications.Cache;
44 45
45namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney 46namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
46{ 47{
@@ -133,6 +134,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
133 if (m_enabled) 134 if (m_enabled)
134 { 135 {
135 scene.RegisterModuleInterface<IMoneyModule>(this); 136 scene.RegisterModuleInterface<IMoneyModule>(this);
137 BaseHttpServer httpServer = scene.CommsManager.HttpServer;
136 138
137 lock (m_scenel) 139 lock (m_scenel)
138 { 140 {
@@ -149,16 +151,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
149 { 151 {
150 // Centralized grid structure using OpenSimWi Redux revision 9+ 152 // Centralized grid structure using OpenSimWi Redux revision 9+
151 // https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux 153 // https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux
152 scene.AddXmlRPCHandler("balanceUpdateRequest", GridMoneyUpdate); 154 httpServer.AddXmlRPCHandler("balanceUpdateRequest", GridMoneyUpdate);
153 scene.AddXmlRPCHandler("userAlert", UserAlert); 155 httpServer.AddXmlRPCHandler("userAlert", UserAlert);
154 } 156 }
155 else 157 else
156 { 158 {
157 // Local Server.. enables functionality only. 159 // Local Server.. enables functionality only.
158 scene.AddXmlRPCHandler("getCurrencyQuote", quote_func); 160 httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func);
159 scene.AddXmlRPCHandler("buyCurrency", buy_func); 161 httpServer.AddXmlRPCHandler("buyCurrency", buy_func);
160 scene.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func); 162 httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func);
161 scene.AddXmlRPCHandler("buyLandPrep", landBuy_func); 163 httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func);
162 } 164 }
163 } 165 }
164 166
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 3490b6f..b752404 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -116,8 +116,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
116 { 116 {
117 if (m_scenes.Count == 0) 117 if (m_scenes.Count == 0)
118 { 118 {
119 scene.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk); 119 scene.CommsManager.HttpServer.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
120 scene.AddXmlRPCHandler("terminate_friend", processTerminateFriend); 120 scene.CommsManager.HttpServer.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
121 m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max 121 m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max
122 m_initialScene = scene; 122 m_initialScene = scene;
123 } 123 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index 353cc77..3977963 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -69,7 +69,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
69 { 69 {
70 if (m_Scenes.Count == 0) 70 if (m_Scenes.Count == 0)
71 { 71 {
72 scene.AddXmlRPCHandler("grid_instant_message", processXMLRPCGridInstantMessage); 72 scene.CommsManager.HttpServer.AddXmlRPCHandler(
73 "grid_instant_message", processXMLRPCGridInstantMessage);
73 } 74 }
74 75
75 scene.RegisterModuleInterface<IMessageTransferModule>(this); 76 scene.RegisterModuleInterface<IMessageTransferModule>(this);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 06e8a54..8e6e258 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4185,11 +4185,6 @@ namespace OpenSim.Region.Environment.Scenes
4185 return m_httpListener.AddHTTPHandler(method, handler); 4185 return m_httpListener.AddHTTPHandler(method, handler);
4186 } 4186 }
4187 4187
4188 public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
4189 {
4190 return m_httpListener.AddXmlRPCHandler(method, handler);
4191 }
4192
4193 public void AddStreamHandler(IRequestHandler handler) 4188 public void AddStreamHandler(IRequestHandler handler)
4194 { 4189 {
4195 m_httpListener.AddStreamHandler(handler); 4190 m_httpListener.AddStreamHandler(handler);