diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-10 10:44:21 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-10 10:44:21 -0500 |
| commit | e3ed1565f8c6eeff5d87f862465038aa98576fa9 (patch) | |
| tree | 4ab57c1658d589d802f1e6bb6ff3331b75b61074 /indra/newview/llviewerobjectlist.h | |
| parent | 952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (diff) | |
| parent | 76cb9a7796ffce930458aae00147f8dafa4b33fb (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | indra/newview/llviewerobjectlist.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 7d0653b3b4..4830f5912b 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -103,6 +103,7 @@ public: void shiftObjects(const LLVector3 &offset); + bool hasMapObjectInRegion(LLViewerRegion* regionp) ; void renderObjectsForMap(LLNetMap &netmap); void renderObjectBounds(const LLVector3 ¢er); |