diff options
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index 67092cb04b..22de4a7047 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1290,9 +1290,9 @@ <key>archive</key> <map> <key>hash</key> - <string>e0dbab27a77d6a864658da4526d7a9c8</string> + <string>088a1c30e499289e94bc1738fd3d6a25</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/270227/arch/Linux/installer/llappearanceutility_source-0.1-linux-20130211.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/270564/arch/Linux/installer/llappearanceutility_source-0.1-linux-20130219.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 58c0a412ed..95d4be17b5 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1870,7 +1870,8 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) return; } - if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_AVATAR))) + if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_AVATAR)) + && !(gSavedSettings.getBOOL("DisableAllRenderTypes"))) { return; } |