diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
| commit | 073ec70829723e54f822052fe9c6c3e998e8dfca (patch) | |
| tree | 3d7e782101a2284bcb0fcbf61273f8167d03544f /indra/newview/llpanelmediasettingspermissions.h | |
| parent | 4d4406820b858d59be670f0ca03bdadefba61c53 (diff) | |
| parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
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; |