diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:05:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:05:53 -0400 |
| commit | d8be66c8e2dc979f7497841cd79fa6bd4172b4c8 (patch) | |
| tree | b5bf17211501903bf0c3dcc360052c50fbc8592f /indra/newview/llviewerregion.h | |
| parent | 347015be33559ca035e1b119d361423b906555db (diff) | |
| parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
merge changes for 5.0.6-release
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index a7bb546d2c..61ce5b454d 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -354,7 +354,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 ;} + std::string getViewerAssetUrl() const { return mViewerAssetUrl; } U32 getNumOfVisibleGroups() const; U32 getNumOfActiveCachedObjects() const; @@ -506,7 +506,7 @@ private: std::string mColoName; std::string mProductSKU; std::string mProductName; - std::string mHttpUrl ; + std::string mViewerAssetUrl ; // Maps local ids to cache entries. // Regions can have order 10,000 objects, so assume |