diff options
author | diva | 2009-02-09 22:27:27 +0000 |
---|---|---|
committer | diva | 2009-02-09 22:27:27 +0000 |
commit | 2c685bff1493451849580cfb6bf44b88322bf0a4 (patch) | |
tree | 4179700c2b1fcbcc7a5ab07f7bc65b3bf97a79d9 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Thank you kindly, TLaukkan (Timmil) for a patch that: (diff) | |
download | opensim-SC-2c685bff1493451849580cfb6bf44b88322bf0a4.zip opensim-SC-2c685bff1493451849580cfb6bf44b88322bf0a4.tar.gz opensim-SC-2c685bff1493451849580cfb6bf44b88322bf0a4.tar.bz2 opensim-SC-2c685bff1493451849580cfb6bf44b88322bf0a4.tar.xz |
Moved prim crossing out of OGS1 and into RESTComms and LocalInterregionComms. This breaks interregion comms with older versions in what concerns prim crossing. In the process of moving the comms, a few things seem to be working better, namely this may address mantis #3011, mantis #1698. Hopefully, this doesn't break anything else. But I'm still seeing weirdnesses with attchments jumping out of place after a cross/TP.
The two most notable changes in the crossing process were:
* Object gets passed in only one message, not two as done before.
* Local object crossings do not get serialized, as done before.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e9f93a6..0ed35af 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3036,7 +3036,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3036 | gobj.RootPart.SetParentLocalId(0); | 3036 | gobj.RootPart.SetParentLocalId(0); |
3037 | gobj.RootPart.IsAttachment = false; | 3037 | gobj.RootPart.IsAttachment = false; |
3038 | gobj.AbsolutePosition = gobj.RootPart.AttachedPos; | 3038 | gobj.AbsolutePosition = gobj.RootPart.AttachedPos; |
3039 | gobj.RootPart.LastOwnerID = gobj.GetFromAssetID(); | 3039 | //gobj.RootPart.LastOwnerID = gobj.GetFromAssetID(); |
3040 | m_log.DebugFormat("[ATTACHMENT]: Sending attachment {0} to region {1}", gobj.UUID, regionHandle); | 3040 | m_log.DebugFormat("[ATTACHMENT]: Sending attachment {0} to region {1}", gobj.UUID, regionHandle); |
3041 | m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj, silent); | 3041 | m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj, silent); |
3042 | } | 3042 | } |