diff options
| author | Richard Linden <none@none> | 2013-07-30 19:13:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:13:45 -0700 |
| commit | a2e22732f195dc075a733c79f15156752f522a43 (patch) | |
| tree | c708db3a28ae578b3b6d8f1cc94935937efd9a1e /indra/newview/llfloaterbulkpermission.h | |
| parent | 19f7fb6ccce52224cc067e496d1480191badb165 (diff) | |
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
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 7dd05df7ee..88532ed124 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" @@ -78,7 +76,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(); @@ -90,7 +88,7 @@ private: LLButton* mCloseBtn; // Object Queue - LLDynamicArray<LLUUID> mObjectIDs; + std::vector<LLUUID> mObjectIDs; LLUUID mCurrentObjectID; BOOL mDone; |