diff options
| author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
| commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
| tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/newview/llpanelpermissions.cpp | |
| parent | Changed version to Experimental 2010.09.18 (diff) | |
| download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz | |
llmediaplugins first step
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llpanelpermissions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp index fc05744..6b318e0 100644 --- a/linden/indra/newview/llpanelpermissions.cpp +++ b/linden/indra/newview/llpanelpermissions.cpp | |||
| @@ -277,7 +277,7 @@ void LLPanelPermissions::refresh() | |||
| 277 | BOOL is_perm_modify = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() | 277 | BOOL is_perm_modify = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() |
| 278 | && LLSelectMgr::getInstance()->selectGetRootsModify()) | 278 | && LLSelectMgr::getInstance()->selectGetRootsModify()) |
| 279 | || LLSelectMgr::getInstance()->selectGetModify(); | 279 | || LLSelectMgr::getInstance()->selectGetModify(); |
| 280 | const LLView* keyboard_focus_view = gFocusMgr.getKeyboardFocus(); | 280 | const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus(); |
| 281 | S32 string_index = 0; | 281 | S32 string_index = 0; |
| 282 | std::string MODIFY_INFO_STRINGS[] = | 282 | std::string MODIFY_INFO_STRINGS[] = |
| 283 | { | 283 | { |