diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-22 06:31:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-22 06:31:10 -0400 |
| commit | a5814da7a676032f4cf2777b1415b1f42f9b0b30 (patch) | |
| tree | 84b2b69f1a6fcc9b4c7b7d8f553a94922bb9cb2a /indra | |
| parent | 49d1c9f05ef17f50ad6cbb696cb6f2401c775d4a (diff) | |
| parent | 729a8d1a7698777ef90340f49aee2c85bd34711b (diff) | |
merge changes for storm-1554
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index b22c6d2fd4..ad65a8846c 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -141,7 +141,7 @@ public: mInventoryItemsDict["Female - Wow"] = LLTrans::getString("Female - Wow"); //common - mInventoryItemsDict["/bow"] = LLTrans::getString("/bow"); + mInventoryItemsDict["/bow1"] = LLTrans::getString("/bow1"); mInventoryItemsDict["/clap"] = LLTrans::getString("/clap"); mInventoryItemsDict["/count"] = LLTrans::getString("/count"); mInventoryItemsDict["/extinguish"] = LLTrans::getString("/extinguish"); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f049f857f0..2094275bed 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3414,7 +3414,7 @@ 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="/bow1">/bow1</string> <string name="/clap">/clap</string> <string name="/count">/count</string> <string name="/extinguish">/extinguish</string> |