diff options
| author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-03-30 15:22:58 -0400 |
|---|---|---|
| committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-03-30 15:22:58 -0400 |
| commit | 7cc3e9b3cf8d70fce2ba0d4a398824e599fc8c5d (patch) | |
| tree | 4eb492fc95d7cbe5c50f5465f757352e2d91f94e /indra/newview/llviewerregion.h | |
| parent | 54f5bf853570a5b1131dfd6826fb015aff856cd5 (diff) | |
| parent | ab30a44d9de332466841bfb40aa494ff0db1089a (diff) | |
merged changes from viewwer-tools-update
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index d01e746936..c14fa5aee8 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -309,12 +309,19 @@ public: bool meshRezEnabled() const; bool meshUploadEnabled() const; + // has region received its simulator features list? Requires an additional query after caps received. + void setSimulatorFeaturesReceived(bool); + bool simulatorFeaturesReceived() const; + boost::signals2::connection setSimulatorFeaturesReceivedCallback(const caps_received_signal_t::slot_type& cb); + void getSimulatorFeatures(LLSD& info) const; void setSimulatorFeatures(const LLSD& info); bool dynamicPathfindingEnabled() const; + bool avatarHoverHeightEnabled() const; + typedef enum { CACHE_MISS_TYPE_FULL = 0, @@ -512,6 +519,7 @@ private: BOOL mCacheDirty; BOOL mAlive; // can become false if circuit disconnects BOOL mCapabilitiesReceived; + BOOL mSimulatorFeaturesReceived; BOOL mReleaseNotesRequested; BOOL mDead; //if true, this region is in the process of deleting. BOOL mPaused; //pause processing the objects in the region @@ -532,11 +540,13 @@ private: CacheMissItem::cache_miss_list_t mCacheMissList; caps_received_signal_t mCapabilitiesReceivedSignal; + caps_received_signal_t mSimulatorFeaturesReceivedSignal; + LLSD mSimulatorFeatures; // the materials capability throttle LLFrameTimer mMaterialsCapThrottleTimer; -LLFrameTimer mRenderInfoRequestTimer; + LLFrameTimer mRenderInfoRequestTimer; }; inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const |