diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Data/IXGroupData.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Data/IXGroupData.cs')
| -rw-r--r-- | OpenSim/Data/IXGroupData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/IXGroupData.cs b/OpenSim/Data/IXGroupData.cs index e5821ef..82073fe 100644 --- a/OpenSim/Data/IXGroupData.cs +++ b/OpenSim/Data/IXGroupData.cs | |||
| @@ -38,12 +38,12 @@ namespace OpenSim.Data | |||
| 38 | public UUID ownerRoleID; | 38 | public UUID ownerRoleID; |
| 39 | public string name; | 39 | public string name; |
| 40 | public string charter; | 40 | public string charter; |
| 41 | public bool showInList; | 41 | public bool showInList; |
| 42 | public UUID insigniaID; | 42 | public UUID insigniaID; |
| 43 | public int membershipFee; | 43 | public int membershipFee; |
| 44 | public bool openEnrollment; | 44 | public bool openEnrollment; |
| 45 | public bool allowPublish; | 45 | public bool allowPublish; |
| 46 | public bool maturePublish; | 46 | public bool maturePublish; |
| 47 | public UUID founderID; | 47 | public UUID founderID; |
| 48 | public ulong everyonePowers; | 48 | public ulong everyonePowers; |
| 49 | public ulong ownersPowers; | 49 | public ulong ownersPowers; |