diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-04 13:15:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-04 13:15:48 -0400 |
| commit | aafc82668073e26e8c8a951a96bff9b1d1993262 (patch) | |
| tree | 1972c12ee782ff3635c07ee89f09f0215f55a969 /indra/newview/llfloatertools.h | |
| parent | c9af158e36eae83f6e3eba97762369affa84848b (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/llfloatertools.h')
| -rwxr-xr-x | indra/newview/llfloatertools.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h index 189bae46c2..df481b8d4c 100755 --- a/indra/newview/llfloatertools.h +++ b/indra/newview/llfloatertools.h @@ -201,11 +201,13 @@ private: std::map<std::string, std::string> mStatusText; + protected: LLSD mMediaSettings; public: static bool sShowObjectCost; + static bool sPreviousFocusOnAvatar; }; |