diff options
author | Melanie | 2010-06-09 16:48:37 +0100 |
---|---|---|
committer | Melanie | 2010-06-09 16:48:37 +0100 |
commit | 6b2d2413f7026c41e7abb55c72c583670cb6011d (patch) | |
tree | 6596f0132d36f74f2e57c9b1bd891d95eb0e5a33 /OpenSim/Data/IXInventoryData.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Add the BEGIN; I had missed (diff) | |
download | opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.zip opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.gz opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.bz2 opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/IXInventoryData.cs')
-rw-r--r-- | OpenSim/Data/IXInventoryData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs index 6909136..d85a7ef 100644 --- a/OpenSim/Data/IXInventoryData.cs +++ b/OpenSim/Data/IXInventoryData.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Data | |||
51 | public int inventoryNextPermissions; | 51 | public int inventoryNextPermissions; |
52 | public int inventoryCurrentPermissions; | 52 | public int inventoryCurrentPermissions; |
53 | public int invType; | 53 | public int invType; |
54 | public UUID creatorID; | 54 | public string creatorID; |
55 | public int inventoryBasePermissions; | 55 | public int inventoryBasePermissions; |
56 | public int inventoryEveryOnePermissions; | 56 | public int inventoryEveryOnePermissions; |
57 | public int salePrice; | 57 | public int salePrice; |