diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-05 10:49:17 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-05 10:49:17 +0100 |
commit | e23643c46b8f80180b1ac901b930c18e5df9171d (patch) | |
tree | da49c1923cf409e9b16a3021f3c8762fe91c0e53 /indra/newview/llviewerregion.h | |
parent | 2d70b8f05286251f25f33a33c507c0a9c0d4e370 (diff) | |
parent | 033f0dbdef5d23858065dcdcc2f70e5546f50651 (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rw-r--r-- | indra/newview/llviewerregion.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 5c4d5a61fd..a9e7ef771c 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -291,6 +291,7 @@ public: friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion); /// implements LLCapabilityProvider virtual std::string getDescription() const; + std::string getHttpUrl() const { return mHttpUrl ;} LLSpatialPartition* getSpatialPartition(U32 type); public: @@ -383,6 +384,7 @@ private: std::string mColoName; std::string mProductSKU; std::string mProductName; + std::string mHttpUrl ; // Maps local ids to cache entries. |