diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-06-20 23:20:30 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-06-20 23:20:30 +0300 |
| commit | e553e6feb2d9ad624d7dd24366d9a21c1dd093b9 (patch) | |
| tree | 806da645cf4599c73057162914a330982036f042 /indra/newview/llviewerregion.h | |
| parent | b959a156bafd83355b6b7350318500cdc14420f3 (diff) | |
| parent | 270cd8ff15d01ff9e2f390ae442e9f5de2b5adec (diff) | |
Merged in lindenlab/viewer-lynx
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 |