aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-08-07 17:22:15 +0000
committerMW2007-08-07 17:22:15 +0000
commit5ac5785cf2af152b44d8faeb3207b671b81c6684 (patch)
tree82e06b144d96d5d5e711a1e7e60e89d1a3810181 /OpenSim/Framework
parent* Removed duplicated Script residue (diff)
downloadopensim-SC_OLD-5ac5785cf2af152b44d8faeb3207b671b81c6684.zip
opensim-SC_OLD-5ac5785cf2af152b44d8faeb3207b671b81c6684.tar.gz
opensim-SC_OLD-5ac5785cf2af152b44d8faeb3207b671b81c6684.tar.bz2
opensim-SC_OLD-5ac5785cf2af152b44d8faeb3207b671b81c6684.tar.xz
a couple of changes in the new Sceneobject classes, just committing so things are kept in sync.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs4
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs1
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 7813adc..9e54701 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -181,9 +181,7 @@ namespace OpenSim.Framework.Communications.Caches
181 item.inventoryNextPermissions = (1 << 15); 181 item.inventoryNextPermissions = (1 << 15);
182 item.inventoryEveryOnePermissions = (1 << 15); 182 item.inventoryEveryOnePermissions = (1 << 15);
183 item.inventoryBasePermissions = (1 << 15); 183 item.inventoryBasePermissions = (1 << 15);
184 this.Items.Add(item.inventoryID, item); 184 this.Items.Add(item.inventoryID, item);
185
186
187 } 185 }
188 186
189 } 187 }
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 297e324..b9ed8d2 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework.Utilities;
36 36
37using OpenSim.Framework.Configuration; 37using OpenSim.Framework.Configuration;
38 38
39
39namespace OpenSim.Framework.Types 40namespace OpenSim.Framework.Types
40{ 41{
41 public class RegionInfo 42 public class RegionInfo