diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerregion.h | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index caf0b0cbf1..d74b77c880 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -42,8 +42,6 @@ #include "m4math.h" // LLMatrix4 #include "llframetimer.h" -#include "llsettingsdaycycle.h" - // Surface id's #define LAND 1 #define WATER 2 @@ -73,13 +71,13 @@ class LLViewerRegionImpl; class LLViewerOctreeGroup; class LLVOCachePartition; -class LLViewerRegion : public LLCapabilityProvider // implements this interface +class LLViewerRegion: public LLCapabilityProvider // implements this interface { public: //MUST MATCH THE ORDER OF DECLARATION IN CONSTRUCTOR - typedef enum + typedef enum { - PARTITION_HUD = 0, + PARTITION_HUD=0, PARTITION_TERRAIN, PARTITION_VOIDWATER, PARTITION_WATER, @@ -159,9 +157,7 @@ public: void dirtyHeights(); LLViewerParcelOverlay *getParcelOverlay() const - { - return mParcelOverlay; - } + { return mParcelOverlay; } inline void setRegionFlag(U64 flag, BOOL on); inline BOOL getRegionFlag(U64 flag) const; @@ -199,7 +195,7 @@ public: void setSimAccess(U8 sim_access) { mSimAccess = sim_access; } U8 getSimAccess() const { return mSimAccess; } const std::string getSimAccessString() const; - + // Homestead-related getters; there are no setters as nobody should be // setting them other than the individual message handler which is a member S32 getSimClassID() const { return mClassID; } @@ -220,7 +216,7 @@ public: // Return access icon name static std::string getAccessIcon(U8 sim_access); - + // helper function which just makes sure all interested parties // can process the message. static void processRegionInfo(LLMessageSystem* msg, void**); @@ -238,7 +234,7 @@ public: bool addVisibleGroup(LLViewerOctreeGroup* group); void addVisibleChildCacheEntry(LLVOCacheEntry* parent, LLVOCacheEntry* child); void addActiveCacheEntry(LLVOCacheEntry* entry); - void removeActiveCacheEntry(LLVOCacheEntry* entry, LLDrawable* drawablep); + void removeActiveCacheEntry(LLVOCacheEntry* entry, LLDrawable* drawablep); void killCacheEntry(U32 local_id); //physically delete the cache entry // Like idleUpdate, but forces everything to complete regardless of @@ -304,7 +300,7 @@ public: U8 getCentralBakeVersion() { return mCentralBakeVersion; } void getInfo(LLSD& info); - + bool meshRezEnabled() const; bool meshUploadEnabled() const; @@ -312,11 +308,11 @@ public: void setSimulatorFeaturesReceived(bool); bool simulatorFeaturesReceived() const; boost::signals2::connection setSimulatorFeaturesReceivedCallback(const caps_received_signal_t::slot_type& cb); - - void getSimulatorFeatures(LLSD& info) const; + + void getSimulatorFeatures(LLSD& info) const; void setSimulatorFeatures(const LLSD& info); - + bool dynamicPathfindingEnabled() const; bool avatarHoverHeightEnabled() const; @@ -338,7 +334,7 @@ public: // handle a full update message eCacheUpdateResult cacheFullUpdate(LLDataPackerBinaryBuffer &dp, U32 flags); - eCacheUpdateResult cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp, U32 flags); + eCacheUpdateResult cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp, U32 flags); LLVOCacheEntry* getCacheEntryForOctree(U32 local_id); LLVOCacheEntry* getCacheEntry(U32 local_id, bool valid = true); bool probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss_type); @@ -368,27 +364,27 @@ public: LLVOCachePartition* getVOCachePartition(); bool objectIsReturnable(const LLVector3& pos, const std::vector<LLBBox>& boxes) const; - bool childrenObjectReturnable(const std::vector<LLBBox>& boxes) const; + bool childrenObjectReturnable( const std::vector<LLBBox>& boxes ) const; bool objectsCrossParcel(const std::vector<LLBBox>& boxes) const; - void getNeighboringRegions(std::vector<LLViewerRegion*>& uniqueRegions); - void getNeighboringRegionsStatus(std::vector<S32>& regions); + void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions ); + void getNeighboringRegionsStatus( std::vector<S32>& regions ); const LLViewerRegionImpl * getRegionImpl() const { return mImpl; } LLViewerRegionImpl * getRegionImplNC() { return mImpl; } // implements the materials capability throttle bool materialsCapThrottled() const { return !mMaterialsCapThrottleTimer.hasExpired(); } void resetMaterialsCapThrottle(); - + U32 getMaxMaterialsPerTransaction() const; void removeFromCreatedList(U32 local_id); - void addToCreatedList(U32 local_id); + void addToCreatedList(U32 local_id); - BOOL isPaused() const { return mPaused; } - S32 getLastUpdate() const { return mLastUpdate; } + BOOL isPaused() const {return mPaused;} + S32 getLastUpdate() const {return mLastUpdate;} - static BOOL isNewObjectCreationThrottleDisabled() { return sNewObjectCreationThrottle < 0; } + static BOOL isNewObjectCreationThrottleDisabled() {return sNewObjectCreationThrottle < 0;} private: void addToVOCacheTree(LLVOCacheEntry* entry); |