diff options
author | diva | 2009-02-13 00:49:58 +0000 |
---|---|---|
committer | diva | 2009-02-13 00:49:58 +0000 |
commit | a54758eef38e911fcdca1cf200e97f56d6bf5e8f (patch) | |
tree | 7524bf1bce0209a024ca013f84cc9e372e13aa1c /OpenSim/Region/Framework | |
parent | Remove extra ID field from asset DB mapping. Mantis #3122, fixes Mantis #3080. (diff) | |
download | opensim-SC-a54758eef38e911fcdca1cf200e97f56d6bf5e8f.zip opensim-SC-a54758eef38e911fcdca1cf200e97f56d6bf5e8f.tar.gz opensim-SC-a54758eef38e911fcdca1cf200e97f56d6bf5e8f.tar.bz2 opensim-SC-a54758eef38e911fcdca1cf200e97f56d6bf5e8f.tar.xz |
Bug fix in prim crossing: making it clear when the local object needs to be cloned (regions on the same instance) and when it doesn't (regions on different instances).
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs index 06ef1aa..d3f44bb 100644 --- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs +++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
70 | /// <returns></returns> | 70 | /// <returns></returns> |
71 | bool SendCloseAgent(ulong regionHandle, UUID id); | 71 | bool SendCloseAgent(ulong regionHandle, UUID id); |
72 | 72 | ||
73 | bool SendCreateObject(ulong regionHandle, ISceneObject sog); | 73 | bool SendCreateObject(ulong regionHandle, ISceneObject sog, bool isLocalCall); |
74 | 74 | ||
75 | } | 75 | } |
76 | 76 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 30b44b1..ffe0b81 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2028,7 +2028,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2028 | 2028 | ||
2029 | // And the new channel... | 2029 | // And the new channel... |
2030 | if (m_interregionCommsOut != null) | 2030 | if (m_interregionCommsOut != null) |
2031 | successYN = m_interregionCommsOut.SendCreateObject(newRegionHandle, grp); | 2031 | successYN = m_interregionCommsOut.SendCreateObject(newRegionHandle, grp, true); |
2032 | 2032 | ||
2033 | if (successYN) | 2033 | if (successYN) |
2034 | { | 2034 | { |