diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llinventory/lluserrelations.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/llinventory/lluserrelations.cpp b/linden/indra/llinventory/lluserrelations.cpp index 86d0fdb..09f4f25 100644 --- a/linden/indra/llinventory/lluserrelations.cpp +++ b/linden/indra/llinventory/lluserrelations.cpp | |||
@@ -14,12 +14,12 @@ | |||
14 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
15 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
17 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
18 | * | 18 | * |
19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
22 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
23 | * | 23 | * |
24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
@@ -41,6 +41,7 @@ const LLRelationship LLRelationship::DEFAULT_RELATIONSHIP = LLRelationship(GRANT | |||
41 | LLRelationship::LLRelationship() : | 41 | LLRelationship::LLRelationship() : |
42 | mGrantToAgent(0), | 42 | mGrantToAgent(0), |
43 | mGrantFromAgent(0), | 43 | mGrantFromAgent(0), |
44 | mChangeSerialNum(0), | ||
44 | mIsOnline(false) | 45 | mIsOnline(false) |
45 | { | 46 | { |
46 | } | 47 | } |
@@ -48,6 +49,7 @@ LLRelationship::LLRelationship() : | |||
48 | LLRelationship::LLRelationship(S32 grant_to, S32 grant_from, bool is_online) : | 49 | LLRelationship::LLRelationship(S32 grant_to, S32 grant_from, bool is_online) : |
49 | mGrantToAgent(grant_to), | 50 | mGrantToAgent(grant_to), |
50 | mGrantFromAgent(grant_from), | 51 | mGrantFromAgent(grant_from), |
52 | mChangeSerialNum(0), | ||
51 | mIsOnline(is_online) | 53 | mIsOnline(is_online) |
52 | { | 54 | { |
53 | } | 55 | } |
@@ -60,6 +62,7 @@ bool LLRelationship::isOnline() const | |||
60 | void LLRelationship::online(bool is_online) | 62 | void LLRelationship::online(bool is_online) |
61 | { | 63 | { |
62 | mIsOnline = is_online; | 64 | mIsOnline = is_online; |
65 | mChangeSerialNum++; | ||
63 | } | 66 | } |
64 | 67 | ||
65 | bool LLRelationship::isRightGrantedTo(S32 rights) const | 68 | bool LLRelationship::isRightGrantedTo(S32 rights) const |
@@ -86,12 +89,14 @@ void LLRelationship::grantRights(S32 to_agent, S32 from_agent) | |||
86 | { | 89 | { |
87 | mGrantToAgent |= to_agent; | 90 | mGrantToAgent |= to_agent; |
88 | mGrantFromAgent |= from_agent; | 91 | mGrantFromAgent |= from_agent; |
92 | mChangeSerialNum++; | ||
89 | } | 93 | } |
90 | 94 | ||
91 | void LLRelationship::revokeRights(S32 to_agent, S32 from_agent) | 95 | void LLRelationship::revokeRights(S32 to_agent, S32 from_agent) |
92 | { | 96 | { |
93 | mGrantToAgent &= ~to_agent; | 97 | mGrantToAgent &= ~to_agent; |
94 | mGrantFromAgent &= ~from_agent; | 98 | mGrantFromAgent &= ~from_agent; |
99 | mChangeSerialNum++; | ||
95 | } | 100 | } |
96 | 101 | ||
97 | 102 | ||