diff options
| author | Don Kjer <don@lindenlab.com> | 2012-07-26 22:59:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-07-26 22:59:30 +0000 |
| commit | bd1b664d45a75e57209e06b288849c0536d00151 (patch) | |
| tree | 863ba132ec822f7f2a3feaf5a934f298374179cd /indra/newview/llslurl.h | |
| parent | cff3469d46d297fbec34bc0d648588e900cd255c (diff) | |
| parent | 124f45d20ecf45c43a9f277be89de2e1fec40b8b (diff) | |
Merge viewer-development -> viewer-horde-fixes
Diffstat (limited to 'indra/newview/llslurl.h')
| -rw-r--r-- | indra/newview/llslurl.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h index 1a3f0543dd..b86cf7949b 100644 --- a/indra/newview/llslurl.h +++ b/indra/newview/llslurl.h @@ -51,13 +51,15 @@ public: static const char* SLURL_APP_PATH; static const char* SLURL_REGION_PATH; + // if you modify this enumeration, update typeName as well enum SLURL_TYPE { INVALID, LOCATION, HOME_LOCATION, LAST_LOCATION, APP, - HELP + HELP, + NUM_SLURL_TYPES // must be last }; @@ -92,6 +94,10 @@ public: std::string asString() const ; protected: + static const std::string typeName[NUM_SLURL_TYPES]; + /// Get a human-readable version of the type for logging + static std::string getTypeString(SLURL_TYPE type); + SLURL_TYPE mType; // used for Apps and Help |