diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-30 10:09:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-30 10:09:39 -0400 |
| commit | f7ddde3807a3437cc036e687d216ef69feb6214b (patch) | |
| tree | c5df56185599509a6fd55936fe6f72703c347eaa /indra/newview | |
| parent | b8a19a490ac56035c2469f3437f18ab887784e60 (diff) | |
| parent | 0db01825c5895b4bbee15abea5f0e24b9aa93021 (diff) | |
merge changes for storm-1614
Diffstat (limited to 'indra/newview')
| -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 ad65a8846c..b22c6d2fd4 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["/bow1"] = LLTrans::getString("/bow1"); + mInventoryItemsDict["/bow"] = LLTrans::getString("/bow"); 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 5d2db8cc4c..a41330c9f6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3439,7 +3439,7 @@ Abuse Report</string> <string name="Female - Stick tougue out">Female - Stick tougue out</string> <string name="Female - Wow">Female - Wow</string> - <string name="/bow1">/bow1</string> + <string name="/bow">/bow</string> <string name="/clap">/clap</string> <string name="/count">/count</string> <string name="/extinguish">/extinguish</string> |