diff options
author | skolb <none@none> | 2009-12-14 14:32:31 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-14 14:32:31 -0800 |
commit | 4a2d57ad489344d77c2bc5213dad2c40c161a34e (patch) | |
tree | 7603c04688b9de5a08b9d06fa1f787beb2291f7c /indra/newview/llpanelmediasettingspermissions.h | |
parent | 93f827ec7855c419c19dbf1a055e7cdc546eb650 (diff) | |
parent | caaf0173aa7f3a98a147357fb2d8b185cb9b8b68 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelmediasettingspermissions.h')
-rw-r--r-- | indra/newview/llpanelmediasettingspermissions.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelmediasettingspermissions.h b/indra/newview/llpanelmediasettingspermissions.h index 45a596c615..bd0c3b8ab5 100644 --- a/indra/newview/llpanelmediasettingspermissions.h +++ b/indra/newview/llpanelmediasettingspermissions.h @@ -65,6 +65,7 @@ public: static void clearValues( void* userdata, bool editable); private: + LLComboBox* mControls; LLCheckBoxCtrl* mPermsOwnerInteract; LLCheckBoxCtrl* mPermsOwnerControl; LLNameBox* mPermsGroupName; |