diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llworld.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h index 2c5815c..62374d5 100644 --- a/linden/indra/newview/llworld.h +++ b/linden/indra/newview/llworld.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * @file llworld.h | 2 | * @file llworld.h |
3 | * @brief Collection of viewer regions in the vacinity of the user. | 3 | * @brief Collection of viewer regions in the vacinity of the user. |
4 | * | 4 | * |
5 | * Represents the whole world, so far as 3D functionality is conserned. | 5 | * Represents the whole world, so far as 3D functionality is concerned. |
6 | * Always contains the region that the user's avatar is in along with | 6 | * Always contains the region that the user's avatar is in along with |
7 | * neighboring regions. As the user crosses region boundaries, new | 7 | * neighboring regions. As the user crosses region boundaries, new |
8 | * regions are added to the world and distant ones are rolled up. | 8 | * regions are added to the world and distant ones are rolled up. |
@@ -152,7 +152,8 @@ public: | |||
152 | 152 | ||
153 | public: | 153 | public: |
154 | typedef std::list<LLViewerRegion*> region_list_t; | 154 | typedef std::list<LLViewerRegion*> region_list_t; |
155 | const region_list_t& getRegionList() const { return mActiveRegionList; } | 155 | region_list_t mActiveRegionList; // KL SD branch public not private |
156 | region_list_t& getRegionList() { return mActiveRegionList; } | ||
156 | 157 | ||
157 | // Returns lists of avatar IDs and their world-space positions within a given distance of a point. | 158 | // Returns lists of avatar IDs and their world-space positions within a given distance of a point. |
158 | // All arguments are optional. Given containers will be emptied and then filled. | 159 | // All arguments are optional. Given containers will be emptied and then filled. |
@@ -163,7 +164,6 @@ public: | |||
163 | const LLVector3d& relative_to = LLVector3d(), F32 radius = FLT_MAX) const; | 164 | const LLVector3d& relative_to = LLVector3d(), F32 radius = FLT_MAX) const; |
164 | 165 | ||
165 | private: | 166 | private: |
166 | region_list_t mActiveRegionList; | ||
167 | region_list_t mRegionList; | 167 | region_list_t mRegionList; |
168 | region_list_t mVisibleRegionList; | 168 | region_list_t mVisibleRegionList; |
169 | region_list_t mCulledRegionList; | 169 | region_list_t mCulledRegionList; |