diff options
| author | prep <prep@lindenlab.com> | 2013-02-28 10:56:12 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-02-28 10:56:12 -0500 |
| commit | 03b51b779fd545e63b6f2fa2ef5ba28f21f1ae62 (patch) | |
| tree | 61989e38aa46f3ee9cb4a84372f865c0b2b97839 /indra/newview/llviewerregion.h | |
| parent | b6f814af25a957e71dc8d9dd314ac15e3cbe6cd9 (diff) | |
SH-3895. Added code to recognize if the second incoming regions seed caps differ in size from the initial region caps. Also avoid starting a inventory fetch responder if the requisite cap is missing"
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 20d96ad9ac..b5fe4677b7 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -241,6 +241,7 @@ public: void failedSeedCapability(); S32 getNumSeedCapRetries(); void setCapability(const std::string& name, const std::string& url); + void setCapabilityDebug(const std::string& name, const std::string& url); // implements LLCapabilityProvider virtual std::string getCapability(const std::string& name) const; @@ -339,7 +340,9 @@ public: void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions ); void getNeighboringRegionsStatus( std::vector<S32>& regions ); - + const LLViewerRegionImpl * getRegionImpl() const { return mImpl; } + LLViewerRegionImpl * getRegionImplNC() { return mImpl; } + public: struct CompareDistance { |