Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into V2TextureSystem

Browse Source
This commit is contained in:
Shyotl
2011-04-17 20:42:59 -05:00
parent c816d25e68 0c2ea7cc9b
commit eded2546fc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoavatar.cpp
View File

@@ -5897,8 +5897,8 @@ std::string LLVOAvatar::getIdleTime()
// animations. // animations.
LLUUID LLVOAvatar::remapMotionID(const LLUUID& id) LLUUID LLVOAvatar::remapMotionID(const LLUUID& id)
{ {
LLCachedControl<bool> use_new_walk_run("UseNewWalkRun",true); static const LLCachedControl<bool> use_new_walk_run("UseNewWalkRun",true);
LLCachedControl<bool> use_cross_walk_run("UseCrossWalkRun",false); static const LLCachedControl<bool> use_cross_walk_run("UseCrossWalkRun",false);
LLUUID result = id; LLUUID result = id;
// start special case female walk for female avatars // start special case female walk for female avatars