summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-17 14:56:33 -0500
committerOz Linden <oz@lindenlab.com>2011-02-17 14:56:33 -0500
commitc1901890576d3b9442846c8890b1724438eab46e (patch)
tree7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/newview/llviewerobjectlist.h
parent10cf492ef1730e869389b704345a6604ed363427 (diff)
parentfb94ad7646b5c8a2eaa65e41b0b8b1679652d956 (diff)
merge changes for storm-937
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r--indra/newview/llviewerobjectlist.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index fda3d6899d..8cff8e988a 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -87,6 +87,7 @@ public:
void shiftObjects(const LLVector3 &offset);
+ bool hasMapObjectInRegion(LLViewerRegion* regionp) ;
void renderObjectsForMap(LLNetMap &netmap);
void renderObjectBounds(const LLVector3 &center);