diff options
| author | Richard Linden <none@none> | 2013-10-07 13:38:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-07 13:38:48 -0700 |
| commit | 2eeee8a9491398697a8f3167bc4f715a3970fc3a (patch) | |
| tree | 1ec811f4a0529edc415c32fb7ec3e6a9406cff2f /indra/newview/lldrawable.cpp | |
| parent | c430673b95823f688c45d0fbda4198595bb41073 (diff) | |
| parent | 17df8988fec3f2ba991ca9e34ff8148253a2fc04 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rwxr-xr-x | indra/newview/lldrawable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 4b6c80b51a..5981153bd5 100755 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -1047,7 +1047,7 @@ bool LLDrawable::isVisible() const } { - LLviewerOctreeGroup* group = mEntry->getGroup(); + LLViewerOctreeGroup* group = mEntry->getGroup(); if (group && group->isVisible()) { LLViewerOctreeEntryData::setVisible(); @@ -1073,7 +1073,7 @@ bool LLDrawable::isRecentlyVisible() const return vis ; } -void LLDrawable::setGroup(LLviewerOctreeGroup *groupp) +void LLDrawable::setGroup(LLViewerOctreeGroup *groupp) { LLSpatialGroup* cur_groupp = (LLSpatialGroup*)getGroup(); |