summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-12-20 22:31:41 -0700
committerXiaohong Bao <bao@lindenlab.com>2012-12-20 22:31:41 -0700
commit76f78e9919597dcd8d5d7461d050b9dd273577be (patch)
tree82add63e52435108c4e946257ffc7bab44646c2f /indra
parentd92414e944b6557b33cc47223e684433a8f5426f (diff)
fix for SH-3151: Some textures not in view load when avatar sits down.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerobject.cpp6
-rw-r--r--indra/newview/llviewertexture.cpp2
-rw-r--r--indra/newview/llviewertexture.h4
3 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index dea76555ce..b1a60197a2 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3282,12 +3282,6 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */)
iter != mChildList.end(); iter++)
{
LLViewerObject* child = *iter;
-
- if(child == gAgentAvatarp)
- {
- //no need to boost self avatar textures when sit.
- continue;
- }
child->boostTexturePriority();
}
}
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 08fcb60d03..0d7616dc88 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1764,7 +1764,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
else if (pixel_priority < 0.001f && !have_all_data)
{
// Not on screen but we might want some data
- if (mBoostLevel > BOOST_HIGH)
+ if (mBoostLevel > BOOST_SELECTED)
{
// Always want high boosted images
priority = 1.f;
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 2e7949e9a3..2eaa0ac92d 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -116,9 +116,9 @@ public:
BOOST_SCULPTED ,
BOOST_HIGH = 10,
- BOOST_BUMP ,
- BOOST_TERRAIN , // has to be high priority for minimap / low detail
BOOST_SELECTED ,
+ BOOST_BUMP ,
+ BOOST_TERRAIN , // has to be high priority for minimap / low detail
BOOST_AVATAR_BAKED_SELF ,
BOOST_AVATAR_SELF , // needed for baking avatar
BOOST_SUPER_HIGH , //textures higher than this need to be downloaded at the required resolution without delay.