diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-09-08 14:36:08 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-09-08 14:36:08 -0700 |
| commit | 873a72fdbad8bca29cf8129b318719c1af5f8e9d (patch) | |
| tree | cf4138d025faf4c697de287a4c9a441432c11e6c /indra/newview/llpanelsnapshot.h | |
| parent | 4e84aa4ecfe3351463ca9c54df4477528f65e41f (diff) | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
Merge with 3.7.15-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(); |