diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:40:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:40:10 -0400 |
| commit | a60875e549aa90f1cef450aabaf23570cf20a22e (patch) | |
| tree | 7dea0d67cce24969c6fc587a16116592ba920bd9 /indra/newview/llsyntaxid.h | |
| parent | bd4f4ee7932797008ed15f8c0301f5a0e5911a64 (diff) | |
| parent | 08ca5279ffbf3e47fc42a32e38339ce806df1741 (diff) | |
merge latest changes from Ima
Diffstat (limited to 'indra/newview/llsyntaxid.h')
| -rw-r--r-- | indra/newview/llsyntaxid.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h index 1b6903f2a2..7d6e120038 100644 --- a/indra/newview/llsyntaxid.h +++ b/indra/newview/llsyntaxid.h @@ -54,8 +54,6 @@ public: static const std::string SIMULATOR_FEATURE; protected: - //LLViewerRegion* region; - static bool sInitialised; static LLSD sKeywordsXml; static bool sLoaded; @@ -111,7 +109,6 @@ protected: void setFileNameCurrent(std::string& name) { mFileNameCurrent = name; } void setFileNameDefault(std::string& name) { mFileNameDefault = name; } void setFileNameNew(std::string name) { mFileNameNew = name; } -// void setSimulatorFeatureName(const std::string& name) { mSimulatorFeature = name; } }; |