aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-17 18:04:55 -0800
committerDiva Canto2010-01-17 18:04:55 -0800
commitb2e6ec9e12ad07eb08496ebe8ca0476b793017d5 (patch)
treeac72f03b9cfca6f344d697f6d7581e5147ccf450 /OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
parentOops, forgot this one. (diff)
downloadopensim-SC_OLD-b2e6ec9e12ad07eb08496ebe8ca0476b793017d5.zip
opensim-SC_OLD-b2e6ec9e12ad07eb08496ebe8ca0476b793017d5.tar.gz
opensim-SC_OLD-b2e6ec9e12ad07eb08496ebe8ca0476b793017d5.tar.bz2
opensim-SC_OLD-b2e6ec9e12ad07eb08496ebe8ca0476b793017d5.tar.xz
Agent gets there through the Gatekeeper, but still a few quirks to fix.
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs')
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index b6eabe3..33e5aa6 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -52,6 +52,8 @@ namespace OpenSim.Server.Handlers.Simulation
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53 private ISimulationService m_SimulationService; 53 private ISimulationService m_SimulationService;
54 54
55 public ObjectHandler() { }
56
55 public ObjectHandler(ISimulationService sim) 57 public ObjectHandler(ISimulationService sim)
56 { 58 {
57 m_SimulationService = sim; 59 m_SimulationService = sim;
@@ -110,7 +112,7 @@ namespace OpenSim.Server.Handlers.Simulation
110 112
111 } 113 }
112 114
113 protected virtual void DoObjectPost(Hashtable request, Hashtable responsedata, UUID regionID) 115 protected void DoObjectPost(Hashtable request, Hashtable responsedata, UUID regionID)
114 { 116 {
115 OSDMap args = Utils.GetOSDMap((string)request["body"]); 117 OSDMap args = Utils.GetOSDMap((string)request["body"]);
116 if (args == null) 118 if (args == null)
@@ -181,7 +183,7 @@ namespace OpenSim.Server.Handlers.Simulation
181 try 183 try
182 { 184 {
183 // This is the meaning of POST object 185 // This is the meaning of POST object
184 result = m_SimulationService.CreateObject(destination, sog, false); 186 result = CreateObject(destination, sog);
185 } 187 }
186 catch (Exception e) 188 catch (Exception e)
187 { 189 {
@@ -192,6 +194,12 @@ namespace OpenSim.Server.Handlers.Simulation
192 responsedata["str_response_string"] = result.ToString(); 194 responsedata["str_response_string"] = result.ToString();
193 } 195 }
194 196
197 // subclasses can override this
198 protected virtual bool CreateObject(GridRegion destination, ISceneObject sog)
199 {
200 return m_SimulationService.CreateObject(destination, sog, false);
201 }
202
195 protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID) 203 protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID)
196 { 204 {
197 OSDMap args = Utils.GetOSDMap((string)request["body"]); 205 OSDMap args = Utils.GetOSDMap((string)request["body"]);