diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatergesture.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 30 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 28 |
3 files changed, 59 insertions, 1 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp index ef3c8b764e..d495f20a9a 100644 --- a/indra/newview/llfloatergesture.cpp +++ b/indra/newview/llfloatergesture.cpp @@ -365,6 +365,8 @@ void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gestur element["columns"][3]["font"]["style"] = font_style; } + LL_DEBUGS("Gesture") << "Added gesture [" << item_name << "]" << LL_ENDL; + LLScrollListItem* sl_item = list->addElement(element, ADD_BOTTOM); if(sl_item) { diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index c532346e6b..b22c6d2fd4 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -139,7 +139,35 @@ public: mInventoryItemsDict["Female - Shrug"] = LLTrans::getString("Female - Shrug"); mInventoryItemsDict["Female - Stick tougue out"]= LLTrans::getString("Female - Stick tougue out"); mInventoryItemsDict["Female - Wow"] = LLTrans::getString("Female - Wow"); - + + //common + mInventoryItemsDict["/bow"] = LLTrans::getString("/bow"); + mInventoryItemsDict["/clap"] = LLTrans::getString("/clap"); + mInventoryItemsDict["/count"] = LLTrans::getString("/count"); + mInventoryItemsDict["/extinguish"] = LLTrans::getString("/extinguish"); + mInventoryItemsDict["/kmb"] = LLTrans::getString("/kmb"); + mInventoryItemsDict["/muscle"] = LLTrans::getString("/muscle"); + mInventoryItemsDict["/no"] = LLTrans::getString("/no"); + mInventoryItemsDict["/no!"] = LLTrans::getString("/no!"); + mInventoryItemsDict["/paper"] = LLTrans::getString("/paper"); + mInventoryItemsDict["/pointme"] = LLTrans::getString("/pointme"); + mInventoryItemsDict["/pointyou"] = LLTrans::getString("/pointyou"); + mInventoryItemsDict["/rock"] = LLTrans::getString("/rock"); + mInventoryItemsDict["/scissor"] = LLTrans::getString("/scissor"); + mInventoryItemsDict["/smoke"] = LLTrans::getString("/smoke"); + mInventoryItemsDict["/stretch"] = LLTrans::getString("/stretch"); + mInventoryItemsDict["/whistle"] = LLTrans::getString("/whistle"); + mInventoryItemsDict["/yes"] = LLTrans::getString("/yes"); + mInventoryItemsDict["/yes!"] = LLTrans::getString("/yes!"); + mInventoryItemsDict["afk"] = LLTrans::getString("afk"); + mInventoryItemsDict["dance1"] = LLTrans::getString("dance1"); + mInventoryItemsDict["dance2"] = LLTrans::getString("dance2"); + mInventoryItemsDict["dance3"] = LLTrans::getString("dance3"); + mInventoryItemsDict["dance4"] = LLTrans::getString("dance4"); + mInventoryItemsDict["dance5"] = LLTrans::getString("dance5"); + mInventoryItemsDict["dance6"] = LLTrans::getString("dance6"); + mInventoryItemsDict["dance7"] = LLTrans::getString("dance7"); + mInventoryItemsDict["dance8"] = LLTrans::getString("dance8"); } /** diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ee6317f367..9b1cfa8f51 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3412,6 +3412,34 @@ Abuse Report</string> <string name="Female - Stick tougue out">Female - Stick tougue out</string> <string name="Female - Wow">Female - Wow</string> + <string name="/bow">/bow</string> + <string name="/clap">/clap</string> + <string name="/count">/count</string> + <string name="/extinguish">/extinguish</string> + <string name="/kmb">/kmb</string> + <string name="/muscle">/muscle</string> + <string name="/no">/no</string> + <string name="/no!">/no!</string> + <string name="/paper">/paper</string> + <string name="/pointme">/pointme</string> + <string name="/pointyou">/pointyou</string> + <string name="/rock">/rock</string> + <string name="/scissor">/scissor</string> + <string name="/smoke">/smoke</string> + <string name="/stretch">/stretch</string> + <string name="/whistle">/whistle</string> + <string name="/yes">/yes</string> + <string name="/yes!">/yes!</string> + <string name="afk">afk</string> + <string name="dance1">dance1</string> + <string name="dance2">dance2</string> + <string name="dance3">dance3</string> + <string name="dance4">dance4</string> + <string name="dance5">dance5</string> + <string name="dance6">dance6</string> + <string name="dance7">dance7</string> + <string name="dance8">dance8</string> + <!-- birth date format shared by avatar inspector and profile panels --> <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> |