diff options
author | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
commit | ea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch) | |
tree | 9cfb5603040efc7738bca633b902c190db28b0bf /indra/newview/llworld.h | |
parent | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
Merge with viewer 3.6.0
Diffstat (limited to 'indra/newview/llworld.h')
-rwxr-xr-x | indra/newview/llworld.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index f350009d10..d0b001ba44 100755 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -76,6 +76,7 @@ public: LLViewerRegion* getRegionFromPosGlobal(const LLVector3d &pos); LLViewerRegion* getRegionFromPosAgent(const LLVector3 &pos); LLViewerRegion* getRegionFromHandle(const U64 &handle); + LLViewerRegion* getRegionFromID(const LLUUID& region_id); BOOL positionRegionValidGlobal(const LLVector3d& pos); // true if position is in valid region LLVector3d clipToVisibleRegions(const LLVector3d &start_pos, const LLVector3d &end_pos); @@ -149,6 +150,9 @@ public: typedef std::list<LLViewerRegion*> region_list_t; const region_list_t& getRegionList() const { return mActiveRegionList; } + typedef boost::signals2::signal<void(LLViewerRegion*)> region_remove_signal_t; + boost::signals2::connection setRegionRemovedCallback(const region_remove_signal_t::slot_type& cb); + // Returns lists of avatar IDs and their world-space positions within a given distance of a point. // All arguments are optional. Given containers will be emptied and then filled. // Not supplying origin or radius input returns data on all avatars in the known regions. @@ -168,6 +172,8 @@ private: region_list_t mVisibleRegionList; region_list_t mCulledRegionList; + region_remove_signal_t mRegionRemovedSignal; + // Number of points on edge static const U32 mWidth; |