diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Data/IXInventoryData.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
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 cd9273e..6909136 100644 --- a/OpenSim/Data/IXInventoryData.cs +++ b/OpenSim/Data/IXInventoryData.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Data | |||
| 58 | public int saleType; | 58 | public int saleType; |
| 59 | public int creationDate; | 59 | public int creationDate; |
| 60 | public UUID groupID; | 60 | public UUID groupID; |
| 61 | public bool groupOwned; | 61 | public int groupOwned; |
| 62 | public int flags; | 62 | public int flags; |
| 63 | public UUID inventoryID; | 63 | public UUID inventoryID; |
| 64 | public UUID avatarID; | 64 | public UUID avatarID; |