diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-19 11:46:51 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-19 11:46:51 -0600 |
commit | 7d88994edc38cf1c037877a5c7c86e35818b7b79 (patch) | |
tree | 94bcc8c30dacf3955c26b9aa54ce3f47e40f52a8 /indra/newview/lldrawable.cpp | |
parent | c5fc8f90060aa7a6c8fbb72313172423b01eddc5 (diff) | |
parent | b38170e6817b3f69274d9b5953584a1278a17ca2 (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 8430c32551..8587c7852b 100755 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -1098,9 +1098,9 @@ LLSpatialPartition* LLDrawable::getSpatialPartition() } //virtual -S32 LLDrawable::getMinFrameRange() const +U32 LLDrawable::getMinFrameRange() const { -const S32 MIN_VIS_FRAME_RANGE = 2 ; //two frames:the current one and the last one. + const U32 MIN_VIS_FRAME_RANGE = 2 ; //two frames:the current one and the last one. return MIN_VIS_FRAME_RANGE ; } |