aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-14 18:54:38 +0000
committerMelanie Thielker2008-11-14 18:54:38 +0000
commitd66f3993de49d80d1db9f139ff08485c2d7d9664 (patch)
tree5008e680b817653dfba71263c7da836005b7c3d3 /OpenSim/Framework
parent* Allow new script creation to be locked down to only gods if specified in Op... (diff)
downloadopensim-SC_OLD-d66f3993de49d80d1db9f139ff08485c2d7d9664.zip
opensim-SC_OLD-d66f3993de49d80d1db9f139ff08485c2d7d9664.tar.gz
opensim-SC_OLD-d66f3993de49d80d1db9f139ff08485c2d7d9664.tar.bz2
opensim-SC_OLD-d66f3993de49d80d1db9f139ff08485c2d7d9664.tar.xz
Add group permissions to agent inventory.
Contains a migration. May contain nuts. Please back up your inventory data store. This revision changes the interface version!! No older regions can connect to these new UGAIM, and the new regions can't connect to the old UGAIM. Fixes a long-standing issue of permissions loss Currently persisted on MySQL only.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs11
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs2
2 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 25cef3f..cd96e01 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -75,6 +75,11 @@ namespace OpenSim.Framework
75 private uint _everyOnePermissions; 75 private uint _everyOnePermissions;
76 76
77 /// <summary> 77 /// <summary>
78 ///
79 /// </summary>
80 private uint _groupPermissions;
81
82 /// <summary>
78 /// The folder this item is contained in 83 /// The folder this item is contained in
79 /// </summary> 84 /// </summary>
80 private UUID _folder; 85 private UUID _folder;
@@ -190,6 +195,12 @@ namespace OpenSim.Framework
190 set { _everyOnePermissions = value; } 195 set { _everyOnePermissions = value; }
191 } 196 }
192 197
198 public uint GroupPermissions
199 {
200 get { return _groupPermissions; }
201 set { _groupPermissions = value; }
202 }
203
193 public int AssetType 204 public int AssetType
194 { 205 {
195 get { return _assetType; } 206 get { return _assetType; }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index c6a43ec..4b3f829 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -48,6 +48,6 @@ namespace OpenSim
48 /// of the code that is too old. 48 /// of the code that is too old.
49 /// 49 ///
50 /// </value> 50 /// </value>
51 public readonly static int MajorInterfaceVersion = 0; 51 public readonly static int MajorInterfaceVersion = 1;
52 } 52 }
53} 53}