diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
| commit | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (patch) | |
| tree | b5ac3f23c9fbd7dba299cd7aa2e8e4f812df98f6 /indra/newview/llfloaterbulkpermission.h | |
| parent | 1953c569a6acfd731af2c459da7a6928be4aaf5b (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.h')
| -rwxr-xr-x | indra/newview/llfloaterbulkpermission.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h index 25e76eca65..0c042c3ee3 100755 --- a/indra/newview/llfloaterbulkpermission.h +++ b/indra/newview/llfloaterbulkpermission.h @@ -28,11 +28,9 @@ #ifndef LL_LLBULKPERMISSION_H #define LL_LLBULKPERMISSION_H -#include "lldarray.h" #include "llinventory.h" #include "llviewerobject.h" #include "llvoinventorylistener.h" -#include "llmap.h" #include "lluuid.h" #include "llfloater.h" @@ -79,7 +77,7 @@ private: void onUncheckAll() { doCheckUncheckAll(FALSE); } // returns true if this is done - BOOL isDone() const { return (mCurrentObjectID.isNull() || (mObjectIDs.count() == 0)); } + BOOL isDone() const { return (mCurrentObjectID.isNull() || (mObjectIDs.size() == 0)); } //Read the settings and Apply the permissions void doApply(); @@ -91,7 +89,7 @@ private: LLButton* mCloseBtn; // Object Queue - LLDynamicArray<LLUUID> mObjectIDs; + std::vector<LLUUID> mObjectIDs; LLUUID mCurrentObjectID; BOOL mDone; |