diff options
author | Aura Linden <aura@lindenlab.com> | 2014-09-08 14:07:39 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-09-08 14:07:39 -0700 |
commit | b33657f3a743398082d7f3ba3f389a21e4b6fd6e (patch) | |
tree | 937784761f0fbbc54df2e7af429e8fdd6e394434 /indra/newview/llpanelsnapshot.h | |
parent | e44dfc0a4eb2c1dc63592f8ced7e35debbbf6238 (diff) | |
parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) |
Pulled merge from release.
Diffstat (limited to 'indra/newview/llpanelsnapshot.h')
-rwxr-xr-x | indra/newview/llpanelsnapshot.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelsnapshot.h b/indra/newview/llpanelsnapshot.h index f3274cf594..42ad798d60 100755 --- a/indra/newview/llpanelsnapshot.h +++ b/indra/newview/llpanelsnapshot.h @@ -57,7 +57,6 @@ public: protected: LLSideTrayPanelContainer* getParentContainer(); - virtual void updateCustomResControls(); void updateImageQualityLevel(); void goBack(); ///< Switch to the default (Snapshot Options) panel void cancel(); |