aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-02-23 02:04:16 +0000
committerUbitUmarov2012-02-23 02:04:16 +0000
commite827bcaf2b4a621de79aa8d342fa2b2eb289dafa (patch)
tree29a632205a7fd1257625bc999d93aeafb001156e /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
parent fix the last fix. Regions are square but... Also remove the 0.5 offset in ma... (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-e827bcaf2b4a621de79aa8d342fa2b2eb289dafa.zip
opensim-SC-e827bcaf2b4a621de79aa8d342fa2b2eb289dafa.tar.gz
opensim-SC-e827bcaf2b4a621de79aa8d342fa2b2eb289dafa.tar.bz2
opensim-SC-e827bcaf2b4a621de79aa8d342fa2b2eb289dafa.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 4132ec7..5037543 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -420,7 +420,7 @@ namespace OpenSim.Services.Connectors.Simulation
420 /// <summary> 420 /// <summary>
421 /// 421 ///
422 /// </summary> 422 /// </summary>
423 public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) 423 public bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall)
424 { 424 {
425 // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start"); 425 // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start");
426 426
@@ -433,6 +433,7 @@ namespace OpenSim.Services.Connectors.Simulation
433 args["sog"] = OSD.FromString(sog.ToXml2()); 433 args["sog"] = OSD.FromString(sog.ToXml2());
434 args["extra"] = OSD.FromString(sog.ExtraToXmlString()); 434 args["extra"] = OSD.FromString(sog.ExtraToXmlString());
435 args["modified"] = OSD.FromBoolean(sog.HasGroupChanged); 435 args["modified"] = OSD.FromBoolean(sog.HasGroupChanged);
436 args["new_position"] = newPosition.ToString();
436 437
437 string state = sog.GetStateSnapshot(); 438 string state = sog.GetStateSnapshot();
438 if (state.Length > 0) 439 if (state.Length > 0)