summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergroups.h
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
committerChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
commitce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch)
tree3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llfloatergroups.h
parentb699ae454d8477d19342d320758cd993d1d28cec (diff)
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llfloatergroups.h')
-rw-r--r--indra/newview/llfloatergroups.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
index 65bed95ea8..cb6ec25444 100644
--- a/indra/newview/llfloatergroups.h
+++ b/indra/newview/llfloatergroups.h
@@ -37,6 +37,7 @@ public:
~LLFloaterGroupPicker();
void setSelectCallback( void (*callback)(LLUUID, void*),
void* userdata);
+ void setPowersMask(U64 powers_mask);
BOOL postBuild();
protected:
@@ -49,6 +50,7 @@ protected:
protected:
LLUUID mID;
+ U64 mPowersMask;
void (*mSelectCallback)(LLUUID id, void* userdata);
void* mCallbackUserdata;