aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2009-07-25 15:49:10 +0000
committerTeravus Ovares2009-07-25 15:49:10 +0000
commit64bd9a335444379ebe1cad8e34d5b5953a76f671 (patch)
tree66b9ce07dbf95e4c118e3d639068e2c44fc52f58 /OpenSim/Region/Framework
parent* Apply http://opensimulator.org/mantis/view.php?id=3586 (diff)
downloadopensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.zip
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.gz
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.bz2
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.xz
* Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes. * E-mail regarding interface changes sent to the opensim-dev list * Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs1
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0b466f7..b48cf62 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3097,11 +3097,11 @@ namespace OpenSim.Region.Framework.Scenes
3097 { 3097 {
3098 if (parcel != null) 3098 if (parcel != null)
3099 { 3099 {
3100 if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowOtherScripts) != 0) 3100 if ((parcel.landData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0)
3101 { 3101 {
3102 return true; 3102 return true;
3103 } 3103 }
3104 else if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) 3104 else if ((parcel.landData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
3105 { 3105 {
3106 if (part.OwnerID == parcel.landData.OwnerID 3106 if (part.OwnerID == parcel.landData.OwnerID
3107 || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) 3107 || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID)
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index a2d8c65..f449e18 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -32,6 +32,7 @@ using System.Text.RegularExpressions;
32using System.Threading; 32using System.Threading;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenMetaverse.Assets;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Region.Framework.Scenes.Serialization; 37using OpenSim.Region.Framework.Scenes.Serialization;
37using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;