aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-23 23:55:02 +0000
committerTeravus Ovares2008-04-23 23:55:02 +0000
commit12bba3da4bb74ac3727763d2bda3fb3eadd4159b (patch)
tree1f6c64b01c033acafd444e83069154cf3bf7b5a3 /OpenSim/Region/Environment/Scenes
parent* Patch from Melanie. Mantis 0001037: Add various internal plumbing to the... (diff)
downloadopensim-SC-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.zip
opensim-SC-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.tar.gz
opensim-SC-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.tar.bz2
opensim-SC-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.tar.xz
* Fixed an annoying pop-up box when crossing borders.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fd729d6..c41a445 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2792,7 +2792,7 @@ namespace OpenSim.Region.Environment.Scenes
2792 { 2792 {
2793 return false; 2793 return false;
2794 } 2794 }
2795 } 2795 }
2796 else 2796 else
2797 { 2797 {
2798 if (part.OwnerID == parcel.landData.ownerID) 2798 if (part.OwnerID == parcel.landData.ownerID)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index ba851fc..e2cb3ac 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Environment.Scenes
650 } 650 }
651 651
652 #endregion 652 #endregion
653 653
654 public LLUUID ObjectOwner 654 public LLUUID ObjectOwner
655 { 655 {
656 get { return OwnerID; } 656 get { return OwnerID; }
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Scenes
797 797
798 return newobject; 798 return newobject;
799 } 799 }
800 800
801 public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim) 801 public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim)
802 { 802 {
803 803