diff options
| author | callum <none@none> | 2009-10-15 15:33:32 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-15 15:33:32 -0700 |
| commit | 893fc8afa71bc5b7bbdc80d8d7520352e73205cb (patch) | |
| tree | 6290820f14de536095bb4859f612f5a45bd0014a /indra/newview/llpanelmediasettingsgeneral.cpp | |
| parent | 113053b504971cb36c7f67f4d0cd56983910a523 (diff) | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
Merge to update new version number.
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.cpp')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp index 4b25b47fa3..16e1901bfd 100644 --- a/indra/newview/llpanelmediasettingsgeneral.cpp +++ b/indra/newview/llpanelmediasettingsgeneral.cpp @@ -32,6 +32,7 @@ #include "llviewerprecompiledheaders.h" +#include "llagent.h" #include "llpanelmediasettingsgeneral.h" #include "llcombobox.h" #include "llcheckboxctrl.h" @@ -47,6 +48,7 @@ #include "llmediaentry.h" #include "llmediactrl.h" #include "llpanelcontents.h" +#include "llpermissions.h" #include "llpluginclassmedia.h" #include "llfloatermediasettings.h" #include "llfloatertools.h" @@ -159,8 +161,7 @@ void LLPanelMediaSettingsGeneral::draw() // current URL can change over time. // updateCurrentURL(); - // enable/disable RESRET button depending on permissions - // since this is the same as a navigate action + LLPermissions perm; bool user_can_press_reset = gFloaterTools->selectedMediaEditable(); // several places modify this widget so we must collect states in one place |