diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-16 07:28:03 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-16 07:28:03 -0600 |
| commit | d73a7fefab55fdc06bbd6e7e3a4dd9d9794bddb5 (patch) | |
| tree | 661c60ce4c5cee9b7f96e533726029dbff409ffb /indra/newview/llsyntaxid.h | |
| parent | 4ce0f6d6eac3817e586bee1edd42ae80aaf21f4f (diff) | |
| parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) | |
Merge upstream
Diffstat (limited to 'indra/newview/llsyntaxid.h')
| -rw-r--r-- | indra/newview/llsyntaxid.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h index 0f347a6ce3..f14693d619 100644 --- a/indra/newview/llsyntaxid.h +++ b/indra/newview/llsyntaxid.h @@ -72,6 +72,10 @@ protected: void setFileNameNew(const std::string name) { mFileNameNew = name; } private: + static const std::string CAPABILITY_NAME; + static const std::string FILENAME_DEFAULT; + static const std::string SIMULATOR_FEATURE; + bool mInitialized; LLSD mKeywordsXml; bool mLoaded; @@ -79,11 +83,14 @@ private: bool mVersionChanged; file_fetched_signal_t mFileFetchedSignal; + std::string mCapabilityName; std::string mCapabilityURL; std::string mFileNameCurrent; + std::string mFileNameDefault; std::string mFileNameNew; ELLPath mFilePath; std::string mFullFileSpec; + std::string mSimulatorFeature; LLUUID mSyntaxIdCurrent; LLUUID mSyntaxIdNew; }; |