diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-18 10:15:55 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-18 10:15:55 +0300 |
| commit | b6ed10e8285e4abef4f14c618186984ef4b2cf7f (patch) | |
| tree | 45eb8f7493cc8755473082961c7212862c8f489c | |
| parent | d8b989a87b94fd851404b42094e88c0a0c213ac8 (diff) | |
| parent | 01eca6f45ee3abf599e669cdf90f4316899f8a22 (diff) | |
Merge from default branch
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/strings.xml | 10 |
2 files changed, 24 insertions, 5 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index bcaba34921..be840cc348 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -55,6 +55,25 @@ char ORDER_NUMBER_SEPARATOR('@'); +// support for secondlife:///app/appearance SLapps +class LLAppearanceHandler : public LLCommandHandler +{ +public: + // requests will be throttled from a non-trusted browser + LLAppearanceHandler() : LLCommandHandler("appearance", UNTRUSTED_THROTTLE) {} + + bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) + { + // support secondlife:///app/appearance/show, but for now we just + // make all secondlife:///app/appearance SLapps behave this way + LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD()); + return true; + } +}; + +LLAppearanceHandler gAppearanceHandler; + + LLUUID findDescendentCategoryIDByName(const LLUUID& parent_id, const std::string& name) { LLInventoryModel::cat_array_t cat_array; diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 560465f808..261c49931e 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1630,25 +1630,25 @@ が渡しました </string> <string name="InvOfferYouDecline"> - You decline + 拒否： </string> <string name="InvOfferFrom"> - from + 送信元： </string> <string name="GroupMoneyTotal"> 合計 </string> <string name="GroupMoneyBought"> - は購入しました + 購入： </string> <string name="GroupMoneyPaidYou"> - があなたに支払いました + あなたに支払い： </string> <string name="GroupMoneyPaidInto"> paid into </string> <string name="GroupMoneyBoughtPassTo"> - bought pass to + 入場許可を購入： </string> <string name="GroupMoneyPaidFeeForEvent"> がイベント用の費用を支払いました |