aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-09-08 04:43:00 -0400
committerTeravus Ovares (Dan Olivares)2009-09-08 04:43:00 -0400
commit9a06056c9afee3f8c99c0a9e9513e5274bfcb45e (patch)
tree9690733d4eef51fac5bdfbcf58b62bc11b010ae1 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-9a06056c9afee3f8c99c0a9e9513e5274bfcb45e.zip
opensim-SC_OLD-9a06056c9afee3f8c99c0a9e9513e5274bfcb45e.tar.gz
opensim-SC_OLD-9a06056c9afee3f8c99c0a9e9513e5274bfcb45e.tar.bz2
opensim-SC_OLD-9a06056c9afee3f8c99c0a9e9513e5274bfcb45e.tar.xz
* Fixes a 'take object from mega region' and rez it in a regular region.. and have it appear 5 regions over bug by limiting the stored position in the asset to Constants.RegionSize. The stored position in the asset gets overwritten anyway by the rezzing routine, but at least this way, there's no chance of the objects border crossing before the rezzing routine finishes.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs17
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3b91dd0..d43a7e2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4256,7 +4256,24 @@ namespace OpenSim.Region.Framework.Scenes
4256 break; 4256 break;
4257 4257
4258 case 2: // Sell a copy 4258 case 2: // Sell a copy
4259
4260
4261 Vector3 inventoryStoredPosition = new Vector3
4262 (((group.AbsolutePosition.X > (int)Constants.RegionSize)
4263 ? 250
4264 : group.AbsolutePosition.X)
4265 ,
4266 (group.AbsolutePosition.X > (int)Constants.RegionSize)
4267 ? 250
4268 : group.AbsolutePosition.X,
4269 group.AbsolutePosition.Z);
4270
4271 Vector3 originalPosition = group.AbsolutePosition;
4272
4273 group.AbsolutePosition = inventoryStoredPosition;
4274
4259 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group); 4275 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group);
4276 group.AbsolutePosition = originalPosition;
4260 4277
4261 uint perms=group.GetEffectivePermissions(); 4278 uint perms=group.GetEffectivePermissions();
4262 4279