diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
| commit | b459f95551c9dd03190d02cb9abcf65cd0749cf3 (patch) | |
| tree | 310cd028cea3fe636ce355d044564f009f40c9ef /indra/newview/llpanelgrouproles.cpp | |
| parent | 6c348f9133e0a0dee000894c40d17ed67bac68a5 (diff) | |
| parent | 76da1229ec26b582e054e8a1588ea78943c92d70 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 445cfe64f7..7a28d10baf 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -51,6 +51,7 @@ #include "lltabcontainer.h" #include "lltextbox.h" #include "lltexteditor.h" +#include "lltrans.h" #include "llviewertexturelist.h" #include "llviewerwindow.h" #include "llfocusmgr.h" @@ -587,7 +588,7 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl, row["columns"][1]["column"] = "action"; row["columns"][1]["type"] = "text"; - row["columns"][1]["value"] = action_set->mActionSetData->mName; + row["columns"][1]["value"] = LLTrans::getString(action_set->mActionSetData->mName); row["columns"][1]["font"]["name"] = "SANSSERIF_SMALL"; |