diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-15 17:14:31 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-15 17:14:31 +0200 |
| commit | e303864c1792a69d25f42b9bc44bc59827cfdbd1 (patch) | |
| tree | cd176a6303c0c9786ee4be729b1f09a831865065 /indra/newview/llpanelmediasettingspermissions.h | |
| parent | 40fa0368919da7b4f3c105c6bdf3a497ac29c360 (diff) | |
| parent | d82f82d7965ec9360cb49ec7e6c1c2f984d4539b (diff) | |
Merge from default branch.
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
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; |