diff options
author | Justin Clark-Casey (justincc) | 2012-02-24 23:35:47 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-24 23:35:59 +0000 |
commit | dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a (patch) | |
tree | 60020a679a229d078ce3be2f933025c81c677d74 /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |
parent | Amend to last commit: synchronize access to queues. (diff) | |
parent | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:... (diff) | |
download | opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.zip opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.gz opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.bz2 opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.xz |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 65f01b3..cb003d1 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -408,7 +408,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
408 | /// <summary> | 408 | /// <summary> |
409 | /// | 409 | /// |
410 | /// </summary> | 410 | /// </summary> |
411 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) | 411 | public bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall) |
412 | { | 412 | { |
413 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start"); | 413 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start"); |
414 | 414 | ||
@@ -421,6 +421,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
421 | args["sog"] = OSD.FromString(sog.ToXml2()); | 421 | args["sog"] = OSD.FromString(sog.ToXml2()); |
422 | args["extra"] = OSD.FromString(sog.ExtraToXmlString()); | 422 | args["extra"] = OSD.FromString(sog.ExtraToXmlString()); |
423 | args["modified"] = OSD.FromBoolean(sog.HasGroupChanged); | 423 | args["modified"] = OSD.FromBoolean(sog.HasGroupChanged); |
424 | args["new_position"] = newPosition.ToString(); | ||
424 | 425 | ||
425 | string state = sog.GetStateSnapshot(); | 426 | string state = sog.GetStateSnapshot(); |
426 | if (state.Length > 0) | 427 | if (state.Length > 0) |