diff options
author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llspatialpartition.cpp | |
parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llspatialpartition.cpp')
-rw-r--r-- | linden/indra/newview/llspatialpartition.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp index d9fa5b5..a9255b3 100644 --- a/linden/indra/newview/llspatialpartition.cpp +++ b/linden/indra/newview/llspatialpartition.cpp | |||
@@ -2617,9 +2617,6 @@ public: | |||
2617 | return; | 2617 | return; |
2618 | } | 2618 | } |
2619 | 2619 | ||
2620 | LLVector3 nodeCenter = group->mBounds[0]; | ||
2621 | LLVector3 octCenter = LLVector3(group->mOctreeNode->getCenter()); | ||
2622 | |||
2623 | for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i) | 2620 | for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i) |
2624 | { | 2621 | { |
2625 | LLDrawable* drawable = *i; | 2622 | LLDrawable* drawable = *i; |
@@ -2860,9 +2857,6 @@ public: | |||
2860 | 2857 | ||
2861 | virtual bool check(LLDrawable* drawable) | 2858 | virtual bool check(LLDrawable* drawable) |
2862 | { | 2859 | { |
2863 | LLVector3 local_start = mStart; | ||
2864 | LLVector3 local_end = mEnd; | ||
2865 | |||
2866 | if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible()) | 2860 | if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible()) |
2867 | { | 2861 | { |
2868 | return false; | 2862 | return false; |