diff options
author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llpreviewgesture.cpp | |
parent | Second Life viewer sources 1.20.6 (diff) | |
download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz |
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/newview/llpreviewgesture.cpp')
-rw-r--r-- | linden/indra/newview/llpreviewgesture.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp index 4ca6009..c53eab7 100644 --- a/linden/indra/newview/llpreviewgesture.cpp +++ b/linden/indra/newview/llpreviewgesture.cpp | |||
@@ -67,9 +67,10 @@ | |||
67 | #include "llviewerstats.h" | 67 | #include "llviewerstats.h" |
68 | #include "llviewerwindow.h" // busycount | 68 | #include "llviewerwindow.h" // busycount |
69 | #include "llappviewer.h" // gVFS | 69 | #include "llappviewer.h" // gVFS |
70 | 70 | #include "llanimstatelabels.h" | |
71 | #include "llresmgr.h" | 71 | #include "llresmgr.h" |
72 | 72 | ||
73 | |||
73 | // *TODO: Translate? | 74 | // *TODO: Translate? |
74 | const char NONE_LABEL[] = "---"; | 75 | const char NONE_LABEL[] = "---"; |
75 | const char SHIFT_LABEL[] = "Shift"; | 76 | const char SHIFT_LABEL[] = "Shift"; |
@@ -592,7 +593,7 @@ void LLPreviewGesture::addAnimations() | |||
592 | for (i = 0; i < gUserAnimStatesCount; ++i) | 593 | for (i = 0; i < gUserAnimStatesCount; ++i) |
593 | { | 594 | { |
594 | // Use the user-readable name | 595 | // Use the user-readable name |
595 | const char* label = gUserAnimStates[i].mLabel; | 596 | std::string label = LLAnimStateLabels::getStateLabel( gUserAnimStates[i].mName ); |
596 | const LLUUID& id = gUserAnimStates[i].mID; | 597 | const LLUUID& id = gUserAnimStates[i].mID; |
597 | combo->add(label, id); | 598 | combo->add(label, id); |
598 | } | 599 | } |