From d970835f411c16e685915bf344c01f207e57c905 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 20 Jan 2010 15:26:29 +0200 Subject: Fixed magor bug EXT-3889 (Group IM window voice icons do not show who has joined the group voice call) - processing agent's speaking indicators in avatar lists in the same way as others (if voice is disabled indicators are invisible) --HG-- branch : product-engine --- indra/newview/llspeakingindicatormanager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index b450d38b5a..5e1d408e8d 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -36,7 +36,6 @@ #include "llspeakingindicatormanager.h" -#include "llagentdata.h" #include "llvoicechannel.h" #include "llvoiceclient.h" @@ -134,7 +133,7 @@ private: ////////////////////////////////////////////////////////////////////////// void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator) { - if (speaker_id == gAgentID) return; + // do not exclude agent's indicators. They should be processed in the same way as others. See EXT-3889. LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << LL_ENDL; speaking_indicator_value_t value_type(speaker_id, speaking_indicator); -- cgit v1.2.3 From 3324c736d7df4035bc73b5f27c8eea756ff43234 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Wed, 20 Jan 2010 15:41:48 +0200 Subject: =?UTF-8?q?fixed=20=20EXT-4515=20=E2=80=9CCrash=20when=20ending=20?= =?UTF-8?q?an=20IM=20session=E2=80=9D,=20corrected=20chiclet=20destroying;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llchiclet.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 1d739f07b1..5497d6121f 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -1293,11 +1293,12 @@ void LLChicletPanel::onChicletClick(LLUICtrl*ctrl,const LLSD¶m) void LLChicletPanel::removeChiclet(chiclet_list_t::iterator it) { - mScrollArea->removeChild(*it); + LLChiclet* chiclet = *it; + mScrollArea->removeChild(chiclet); mChicletList.erase(it); arrange(); - (*it)->die(); + chiclet->die(); } void LLChicletPanel::removeChiclet(S32 index) -- cgit v1.2.3 From a719c3631a06169c4cd1caca9a35ba5f2edc7981 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 20 Jan 2010 16:25:26 +0200 Subject: Fixed major bug EXT-4364 ( Crash clicking "View IM & Chat" when someone else joins group call) - disabled processing of Incoming dialog buttons' clicks after viewer is disconnected --HG-- branch : product-engine --- indra/newview/llimview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6064415a10..3ff156eca3 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -45,6 +45,7 @@ #include "lluictrlfactory.h" #include "llagent.h" +#include "llappviewer.h" #include "llavatariconctrl.h" #include "llbottomtray.h" #include "llcallingcard.h" @@ -1855,7 +1856,7 @@ void LLIncomingCallDialog::onStartIM(void* user_data) void LLIncomingCallDialog::processCallResponse(S32 response) { - if (!gIMMgr) + if (!gIMMgr || gDisconnected) return; LLUUID session_id = mPayload["session_id"].asUUID(); -- cgit v1.2.3 From 086135b6849bad2e3a5ddcf9bb9540fdb6fb72dd Mon Sep 17 00:00:00 2001 From: Ychebotarev ProductEngine Date: Wed, 20 Jan 2010 17:11:29 +0200 Subject: more on removing LLFloaterChat there was some places with messages that (as I think) should not go to nearby chat. but still probably should go somewhere... code is commented and messages are marked with: //TODO* CHAT: how to show this? --HG-- branch : product-engine --- indra/newview/llcompilequeue.cpp | 10 ++++++++ indra/newview/llviewermenu.cpp | 50 +++++++++++++++++++++++++++++++++++++-- indra/newview/llviewermessage.cpp | 14 ++++------- 3 files changed, 62 insertions(+), 12 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index 72074955d1..47f1b7c9f5 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -446,10 +446,20 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id, if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ) { + //TODO* CHAT: how to show this? + //LLSD args; + //args["MESSAGE"] = LLTrans::getString("CompileQueueScriptNotFound); + //LLNotificationsUtil::add("SystemMessage", args); + buffer = LLTrans::getString("CompileQueueProblemDownloading") + (": ") + data->mScriptName; } else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status) { + //TODO* CHAT: how to show this? + //LLSD args; + //args["MESSAGE"] = LLTrans::getString("CompileQueueScriptNotFound); + //LLNotificationsUtil::add("SystemMessage", args); + buffer = LLTrans::getString("CompileQueueInsufficientPermFor") + (": ") + data->mScriptName; } else diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index d96d7df24a..5692ccee29 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6373,8 +6373,54 @@ class LLToolsSelectedScriptAction : public view_listener_t void handle_selected_texture_info(void*) { - //useless without LLFloaterChat - //as since we don't use LLFloaterChat... + for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin(); + iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++) + { + LLSelectNode* node = *iter; + + std::string msg; + msg.assign("Texture info for: "); + msg.append(node->mName); + LLChat chat(msg); + LLFloaterChat::addChat(chat); + + U8 te_count = node->getObject()->getNumTEs(); + // map from texture ID to list of faces using it + typedef std::map< LLUUID, std::vector > map_t; + map_t faces_per_texture; + for (U8 i = 0; i < te_count; i++) + { + if (!node->isTESelected(i)) continue; + + LLViewerTexture* img = node->getObject()->getTEImage(i); + LLUUID image_id = img->getID(); + faces_per_texture[image_id].push_back(i); + } + // Per-texture, dump which faces are using it. + map_t::iterator it; + for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it) + { + LLUUID image_id = it->first; + U8 te = it->second[0]; + LLViewerTexture* img = node->getObject()->getTEImage(te); + S32 height = img->getHeight(); + S32 width = img->getWidth(); + S32 components = img->getComponents(); + msg = llformat("%dx%d %s on face ", + width, + height, + (components == 4 ? "alpha" : "opaque")); + for (U8 i = 0; i < it->second.size(); ++i) + { + msg.append( llformat("%d ", (S32)(it->second[i]))); + } + + //TODO* CHAT: how to show this? + //LLSD args; + //args["MESSAGE"] = msg; + //LLNotificationsUtil::add("SystemMessage", args); + } + } } void handle_test_male(void*) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5279c4174a..8372711cd1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1356,7 +1356,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const if (check_offer_throttle(mFromName, true)) { log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString("."); - //TODO* should go to history only - how? + //TODO* CHAT: how to show this? //LLSD args; //args["MESSAGE"] = log_message; //LLNotificationsUtil::add("SystemMessage", args); @@ -1401,7 +1401,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const // send the message msg->sendReliable(mHost); - //TODO* should go to message history only... + //TODO* CHAT: how to show this? //log_message = LLTrans::getString("InvOfferYouDecline") + " " + mDesc + " " + LLTrans::getString("InvOfferFrom") + " " + mFromName +"."; //LLSD args; //args["MESSAGE"] = log_message; @@ -1829,17 +1829,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // history. Pretend the chat is from a local agent, // so it will go into the history but not be shown on screen. - //TODO* should go to message hisyory only + //TODO* CHAT: how to show this? //and this is not system message... //LLSD args; //args["MESSAGE"] = buffer; //LLNotificationsUtil::add("SystemMessage", args); - - /* - chat.mText = buffer; - BOOL local_agent = TRUE; - LLFloaterChat::addChat( chat, TRUE, local_agent ); - */ } } break; @@ -3076,7 +3070,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) { // Chat the "back" SLURL. (DEV-4907) - //should go to history only so leave commented + //TODO* CHAT: how to show this? //LLSD args; //args["MESSAGE"] = message; //LLNotificationsUtil::add("SystemMessage", args); -- cgit v1.2.3 From a03e00799a2fb0a293c414870184bf4ec911eb45 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 20 Jan 2010 17:24:01 +0200 Subject: fixed EXT-4428 [BSI] Chat bubble color preference doesn't honor color choice --HG-- branch : product-engine --- .../newview/skins/default/xui/en/panel_preferences_advanced.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 1e7acb566f..141678f7eb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -34,7 +34,14 @@ name="background" tool_tip="Choose color for bubble chat" top_delta="1" - width="44" /> + width="44"> + + + Date: Wed, 20 Jan 2010 17:56:47 +0200 Subject: more on LLFloaterChat - oops...commit code with error --HG-- branch : product-engine --- indra/newview/llviewermenu.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 5692ccee29..f1d550f625 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6381,8 +6381,11 @@ void handle_selected_texture_info(void*) std::string msg; msg.assign("Texture info for: "); msg.append(node->mName); - LLChat chat(msg); - LLFloaterChat::addChat(chat); + + //TODO* CHAT: how to show this? + //LLSD args; + //args["MESSAGE"] = msg; + //LLNotificationsUtil::add("SystemMessage", args); U8 te_count = node->getObject()->getNumTEs(); // map from texture ID to list of faces using it -- cgit v1.2.3 From 5f2669ab62b284759d0f471bca26549a1387d269 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 20 Jan 2010 18:22:56 +0200 Subject: got rid of win CR --HG-- branch : product-engine --- indra/newview/llviewermenu.cpp | 86 +++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f1d550f625..3f556e5608 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6373,57 +6373,57 @@ class LLToolsSelectedScriptAction : public view_listener_t void handle_selected_texture_info(void*) { - for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin(); - iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++) - { - LLSelectNode* node = *iter; - - std::string msg; - msg.assign("Texture info for: "); - msg.append(node->mName); - + for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin(); + iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++) + { + LLSelectNode* node = *iter; + + std::string msg; + msg.assign("Texture info for: "); + msg.append(node->mName); + //TODO* CHAT: how to show this? //LLSD args; //args["MESSAGE"] = msg; //LLNotificationsUtil::add("SystemMessage", args); - - U8 te_count = node->getObject()->getNumTEs(); - // map from texture ID to list of faces using it - typedef std::map< LLUUID, std::vector > map_t; - map_t faces_per_texture; - for (U8 i = 0; i < te_count; i++) - { - if (!node->isTESelected(i)) continue; - - LLViewerTexture* img = node->getObject()->getTEImage(i); - LLUUID image_id = img->getID(); - faces_per_texture[image_id].push_back(i); - } - // Per-texture, dump which faces are using it. - map_t::iterator it; - for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it) - { - LLUUID image_id = it->first; - U8 te = it->second[0]; - LLViewerTexture* img = node->getObject()->getTEImage(te); - S32 height = img->getHeight(); - S32 width = img->getWidth(); - S32 components = img->getComponents(); - msg = llformat("%dx%d %s on face ", - width, - height, - (components == 4 ? "alpha" : "opaque")); - for (U8 i = 0; i < it->second.size(); ++i) - { - msg.append( llformat("%d ", (S32)(it->second[i]))); - } - + + U8 te_count = node->getObject()->getNumTEs(); + // map from texture ID to list of faces using it + typedef std::map< LLUUID, std::vector > map_t; + map_t faces_per_texture; + for (U8 i = 0; i < te_count; i++) + { + if (!node->isTESelected(i)) continue; + + LLViewerTexture* img = node->getObject()->getTEImage(i); + LLUUID image_id = img->getID(); + faces_per_texture[image_id].push_back(i); + } + // Per-texture, dump which faces are using it. + map_t::iterator it; + for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it) + { + LLUUID image_id = it->first; + U8 te = it->second[0]; + LLViewerTexture* img = node->getObject()->getTEImage(te); + S32 height = img->getHeight(); + S32 width = img->getWidth(); + S32 components = img->getComponents(); + msg = llformat("%dx%d %s on face ", + width, + height, + (components == 4 ? "alpha" : "opaque")); + for (U8 i = 0; i < it->second.size(); ++i) + { + msg.append( llformat("%d ", (S32)(it->second[i]))); + } + //TODO* CHAT: how to show this? //LLSD args; //args["MESSAGE"] = msg; //LLNotificationsUtil::add("SystemMessage", args); - } - } + } + } } void handle_test_male(void*) -- cgit v1.2.3 From 9c277d95b6ed91fd43aa70c433db21ae44799f42 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 20 Jan 2010 18:23:23 +0200 Subject: fixed EXT-4162 Remove "Show IMs in Nearby Chat" --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 11 ----------- indra/newview/llfloaterchat.cpp | 16 ++-------------- indra/newview/llfloaterchat.h | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 11 ----------- 4 files changed, 3 insertions(+), 37 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 69336243da..53ac1dc0b9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3664,17 +3664,6 @@ Value - IMInChat - - Comment - Copy IM into chat console - Persist - 1 - Type - Boolean - Value - 0 - IMShowTimestamps Comment diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index c24c224133..cdb9b8edb8 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -311,7 +311,7 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data) } // Put a line of chat in all the right places -void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL local_agent) +void LLFloaterChat::addChat(const LLChat& chat, BOOL local_agent) { triggerAlerts(chat.mText); @@ -321,19 +321,7 @@ void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL //if(chat.mSourceType == CHAT_SOURCE_AGENT && chat.mFromID.notNull()) // LLRecentPeople::instance().add(chat.mFromID); - bool add_chat = true; - bool log_chat = true; - if(from_instant_message) - { - if (!gSavedSettings.getBOOL("IMInChat")) - add_chat = false; - //log_chat = false; -} - - if (add_chat) - { - addChatHistory(chat, log_chat); - } + addChatHistory(chat, true); } // Moved from lltextparser.cpp to break llui/llaudio library dependency. diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h index 84fc199bfa..4437a0a5c2 100644 --- a/indra/newview/llfloaterchat.h +++ b/indra/newview/llfloaterchat.h @@ -61,7 +61,7 @@ public: // *TODO:Skinning - move these to LLChat (or LLViewerChat?) // Add chat to console and history list. // Color based on source, type, distance. - static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE); + static void addChat(const LLChat& chat, BOOL local_agent = FALSE); // Add chat to history alone. static void addChatHistory(const LLChat& chat, bool log_to_file = true); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 21fe2bb242..a98a049c17 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1603,17 +1603,6 @@ function="ToggleControl" parameter="MouseSmooth" /> - - - - Date: Tue, 19 Jan 2010 17:22:13 +0200 Subject: Fix for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. --HG-- branch : product-engine --- indra/newview/lllandmarklist.cpp | 6 ++++++ indra/newview/llpanelplaces.cpp | 2 ++ 2 files changed, 8 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index bd9d22c327..355f048308 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -59,6 +59,12 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t LLLandmark* landmark = get_ptr_in_map(mList, asset_uuid); if(landmark) { + if(cb && !landmark->getGlobalPos(LLVector3d())) + { + // landmark is not completely loaded yet + loaded_callback_map_t::value_type vt(asset_uuid, cb); + mLoadedCallbackMap.insert(vt); + } return landmark; } else diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 685104a8b1..59b12c7096 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -460,6 +460,8 @@ void LLPanelPlaces::onLandmarkLoaded(LLLandmark* landmark) mLandmarkInfo->displayParcelInfo(region_id, mPosGlobal); mSaveBtn->setEnabled(TRUE); + + updateVerbs(); } void LLPanelPlaces::onFilterEdit(const std::string& search_string, bool force_filter) -- cgit v1.2.3 From f53f65cc1a90673af0b7dde970c175ed9acd60fc Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 19 Jan 2010 18:03:25 +0200 Subject: Update for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. --HG-- branch : product-engine --- indra/newview/llpanellandmarkinfo.cpp | 7 +++++++ indra/newview/llpanelplaces.cpp | 16 ++++++++++++++++ indra/newview/llpanelplaces.h | 2 ++ indra/newview/llviewermessage.cpp | 1 + 4 files changed, 26 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp index 597b8bdb2d..9654e17659 100644 --- a/indra/newview/llpanellandmarkinfo.cpp +++ b/indra/newview/llpanellandmarkinfo.cpp @@ -185,6 +185,13 @@ void LLPanelLandmarkInfo::processParcelInfo(const LLParcelData& parcel_data) region_z = llround(mPosRegion.mV[VZ]); } + LLSD info; + info["update_verbs"] = true; + info["global_x"] = parcel_data.global_x; + info["global_y"] = parcel_data.global_y; + info["global_z"] = parcel_data.global_z; + notifyParent(info); + if (mInfoType == CREATE_LANDMARK) { if (parcel_data.name.empty()) diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 59b12c7096..a71c8d8958 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -449,6 +449,22 @@ void LLPanelPlaces::setItem(LLInventoryItem* item) } } +S32 LLPanelPlaces::notifyParent(const LLSD& info) +{ + if(info.has("update_verbs")) + { + if(mPosGlobal.isExactlyZero()) + { + mPosGlobal.setVec(info["global_x"], info["global_y"], info["global_z"]); + } + + updateVerbs(); + + return 1; + } + return LLPanel::notifyParent(info); +} + void LLPanelPlaces::onLandmarkLoaded(LLLandmark* landmark) { if (!mLandmarkInfo) diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index b134cf0cba..27b5911ebb 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -75,6 +75,8 @@ public: std::string getPlaceInfoType() { return mPlaceInfoType; } + /*virtual*/ S32 notifyParent(const LLSD& info); + private: void onLandmarkLoaded(LLLandmark* landmark); void onFilterEdit(const std::string& search_string, bool force_filter); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8372711cd1..6061d23477 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -961,6 +961,7 @@ void open_inventory_offer(const std::vector& items, const std::string& f const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") && (asset_type != LLAssetType::AT_CALLINGCARD) && (item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) && + (asset_type != LLAssetType::AT_LANDMARK) && !from_name.empty(); LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open); if(active_panel) -- cgit v1.2.3 From 284279966be66323418d5aaaaf96d16d90a12c8a Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 20 Jan 2010 13:16:23 +0200 Subject: Fixed normal bug EXT-4476 - Classfield appears in classfield accordeon after error message about money scarcity has been closed. --HG-- branch : product-engine --- indra/newview/llpanelclassified.cpp | 15 ++++++++++++++- indra/newview/llpanelclassified.h | 1 + indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index e29320ffc2..01b3f3bb7f 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -72,6 +72,7 @@ #include "llviewerwindow.h" // for window width, height #include "llappviewer.h" // abortQuit() #include "lltrans.h" +#include "llstatusbar.h" const S32 MINIMUM_PRICE_FOR_LISTING = 50; // L$ const S32 MATURE_UNDEFINED = -1; @@ -1364,6 +1365,7 @@ static const S32 CB_ITEM_PG = 1; LLPanelClassifiedEdit::LLPanelClassifiedEdit() : LLPanelClassifiedInfo() , mIsNew(false) + , mCanClose(false) { } @@ -1559,7 +1561,7 @@ void LLPanelClassifiedEdit::resetControls() bool LLPanelClassifiedEdit::canClose() { - return isValidName(); + return mCanClose; } void LLPanelClassifiedEdit::sendUpdate() @@ -1676,12 +1678,23 @@ void LLPanelClassifiedEdit::onChange() void LLPanelClassifiedEdit::onSaveClick() { + mCanClose = false; + if(!isValidName()) { notifyInvalidName(); return; } + if(isNew()) + { + if(gStatusBar->getBalance() < getPriceForListing()) + { + LLNotificationsUtil::add("ClassifiedInsuffisientFunds"); + return; + } + } + mCanClose = true; sendUpdate(); resetDirty(); } diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 10fdf60bbe..e46806f576 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -340,6 +340,7 @@ protected: private: bool mIsNew; + bool mCanClose; }; #endif // LL_LLPANELCLASSIFIED_H diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1ec004b194..e5933816ef 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -770,6 +770,16 @@ Save changes to classified [NAME]? notext="Don't Save" yestext="Save"/> + + +Insuffisient funds to create classified. + + Date: Wed, 20 Jan 2010 14:18:28 +0200 Subject: Update for major bug EXT-4206 - Bottom bar spec calls for button background art on IM Chiclets. Adjusted chiclets height to match other bottom bar widgets height. --HG-- branch : product-engine --- .../skins/default/xui/en/widgets/chiclet_im_adhoc.xml | 14 +++++++------- .../skins/default/xui/en/widgets/chiclet_im_group.xml | 14 +++++++------- .../skins/default/xui/en/widgets/chiclet_im_p2p.xml | 14 +++++++------- .../newview/skins/default/xui/en/widgets/chiclet_offer.xml | 8 ++++---- .../skins/default/xui/en/widgets/chiclet_script.xml | 8 ++++---- 5 files changed, 29 insertions(+), 29 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 2bec5b8a29..328d521636 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -1,11 +1,11 @@ + width="18" /> Date: Wed, 20 Jan 2010 17:17:15 +0200 Subject: Update for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6061d23477..066298de97 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -908,6 +908,14 @@ void open_inventory_offer(const std::vector& items, const std::string& f LLSideTray::getInstance()->showPanel("panel_places", LLSD().with("type", "landmark").with("id", item->getUUID())); } + else if("group_offer" == from_name) + { + // do not open inventory when we open group notice attachment because + // we already opened landmark info panel + // "group_offer" is passed by LLOpenTaskGroupOffer + + continue; + } else if(from_name.empty()) { // we receive a message from LLOpenTaskOffer, it mean that new landmark has been added. @@ -961,7 +969,6 @@ void open_inventory_offer(const std::vector& items, const std::string& f const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") && (asset_type != LLAssetType::AT_CALLINGCARD) && (item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) && - (asset_type != LLAssetType::AT_LANDMARK) && !from_name.empty(); LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open); if(active_panel) -- cgit v1.2.3 From da00631c638acbf3d3b6ecbe5edb5abecf03252c Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 20 Jan 2010 18:21:54 +0200 Subject: Update for low bug EXT-4371 - Text from search history drop-down list merge with landmarks on 'Favorites Bar'. Made border customisable in combo box. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 6 +++++- indra/newview/skins/default/xui/en/widgets/scroll_list.xml | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 58cb5fed5d..bfc97ed5da 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -127,7 +127,11 @@ label="Search [SECOND_LIFE]" name="search_combo_editor"/> + draw_border="true" + border.highlight_light_color="FocusColor" + border.highlight_dark_color="FocusColor" + border.shadow_light_color="FocusColor" + border.shadow_dark_color="FocusColor"/> + draw_heading="false" + border.name="dig border" + border.bevel_style="in" /> -- cgit v1.2.3 From 8758fac7124ff07f2a003bf5719c19a4dab170b9 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 20 Jan 2010 19:49:41 +0200 Subject: Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save Pick" button to be active) * Changed the Save button to react on texture picker commit, not on selection. * Added an optional "no_commit_on_selection" parameter to LLTextureCtrl to commit only when user presses the OK button in the picker or changes the texture via DnD, i.e. browsing in the picker doesn't commit. --HG-- branch : product-engine --- indra/newview/llpanelpick.cpp | 20 +++++++------------- indra/newview/llpanelpick.h | 5 +++++ indra/newview/lltexturectrl.cpp | 7 ++++++- indra/newview/lltexturectrl.h | 3 +++ .../newview/skins/default/xui/en/panel_edit_pick.xml | 1 + 5 files changed, 22 insertions(+), 14 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index e7615929c8..5ac0587550 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -448,7 +448,7 @@ BOOL LLPanelPickEdit::postBuild() { LLPanelPickInfo::postBuild(); - mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelPickEdit::onPickChanged, this, _1)); + mSnapshotCtrl->setCommitCallback(boost::bind(&LLPanelPickEdit::onSnapshotChanged, this)); LLLineEditor* line_edit = getChild("pick_name"); line_edit->setKeystrokeCallback(boost::bind(&LLPanelPickEdit::onPickChanged, this, _1), NULL); @@ -537,16 +537,14 @@ void LLPanelPickEdit::sendUpdate() } } +void LLPanelPickEdit::onSnapshotChanged() +{ + enableSaveButton(true); +} + void LLPanelPickEdit::onPickChanged(LLUICtrl* ctrl) { - if(isDirty()) - { - enableSaveButton(true); - } - else - { - enableSaveButton(false); - } + enableSaveButton(isDirty()); } void LLPanelPickEdit::resetData() @@ -613,10 +611,6 @@ void LLPanelPickEdit::initTexturePickerMouseEvents() mSnapshotCtrl->setMouseEnterCallback(boost::bind(&LLPanelPickEdit::onTexturePickerMouseEnter, this, _1)); mSnapshotCtrl->setMouseLeaveCallback(boost::bind(&LLPanelPickEdit::onTexturePickerMouseLeave, this, _1)); - // *WORKAROUND: Needed for EXT-1625: enabling save button each time when picker is opened, even if - // texture wasn't changed (see Steve's comment). - mSnapshotCtrl->setMouseDownCallback(boost::bind(&LLPanelPickEdit::enableSaveButton, this, true)); - text_icon->setVisible(FALSE); } diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h index 62c3b20c0d..4f27760a8d 100644 --- a/indra/newview/llpanelpick.h +++ b/indra/newview/llpanelpick.h @@ -221,6 +221,11 @@ protected: */ void sendUpdate(); + /** + * Called when snapshot image changes. + */ + void onSnapshotChanged(); + /** * Callback for Pick snapshot, name and description changed event. */ diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index b980f65e68..9c4825763b 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -878,6 +878,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) { setAllowNoTexture(p.allow_no_texture); setCanApplyImmediately(p.can_apply_immediately); + mCommitOnSelection = !p.no_commit_on_selection; LLTextBox::Params params(p.caption_text); params.name(p.label); @@ -1122,7 +1123,11 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op) } else { - onCommit(); + // If the "no_commit_on_selection" parameter is set + // we commit only when user presses OK in the picker + // (i.e. op == TEXTURE_SELECT) or changes texture via DnD. + if (mCommitOnSelection || op == TEXTURE_SELECT) + onCommit(); } } } diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index fb1d591e32..023329a9b2 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -74,6 +74,7 @@ public: Optional default_image_name; Optional allow_no_texture; Optional can_apply_immediately; + Optional no_commit_on_selection; // don't commit unless it's DnD or OK button press Optional label_width; Optional border_color; @@ -88,6 +89,7 @@ public: default_image_name("default_image_name"), allow_no_texture("allow_no_texture"), can_apply_immediately("can_apply_immediately"), + no_commit_on_selection("no_commit_on_selection", false), label_width("label_width", -1), border_color("border_color"), multiselect_text("multiselect_text"), @@ -204,6 +206,7 @@ private: PermissionMask mImmediateFilterPermMask; PermissionMask mNonImmediateFilterPermMask; BOOL mCanApplyImmediately; + BOOL mCommitOnSelection; BOOL mNeedsRawImageData; LLViewBorder* mBorder; BOOL mValid; diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 15eff4b67c..8e39697a16 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -61,6 +61,7 @@ height="197" width="280" layout="topleft" + no_commit_on_selection="true" top="20" left="10" name="pick_snapshot" /> -- cgit v1.2.3 From 5a46b59284ac313a0e7737fd600d020c07c352cd Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 20 Jan 2010 10:25:06 -0800 Subject: Convert all XML files to Unix line endings --- .../newview/skins/default/xui/da/floater_about.xml | 162 +- .../skins/default/xui/da/floater_mute_object.xml | 28 +- .../skins/default/xui/da/floater_report_abuse.xml | 206 +- .../newview/skins/default/xui/da/floater_stats.xml | 142 +- .../skins/default/xui/da/menu_inventory.xml | 164 +- .../skins/default/xui/da/menu_inventory_add.xml | 64 +- indra/newview/skins/default/xui/da/menu_picks.xml | 16 +- .../default/xui/da/menu_places_gear_landmark.xml | 36 +- .../default/xui/da/panel_block_list_sidetray.xml | 20 +- .../skins/default/xui/da/panel_group_roles.xml | 242 +- indra/newview/skins/default/xui/da/panel_login.xml | 76 +- .../skins/default/xui/da/panel_main_inventory.xml | 128 +- .../default/xui/da/panel_preferences_advanced.xml | 96 +- .../default/xui/da/panel_preferences_alerts.xml | 28 +- .../default/xui/da/panel_preferences_chat.xml | 84 +- .../default/xui/da/panel_preferences_sound.xml | 76 +- .../skins/default/xui/da/panel_world_map.xml | 114 +- indra/newview/skins/default/xui/da/strings.xml | 6484 ++++++++++---------- .../skins/default/xui/da/teleport_strings.xml | 158 +- .../newview/skins/default/xui/de/floater_about.xml | 160 +- .../skins/default/xui/de/floater_about_land.xml | 956 +-- .../skins/default/xui/de/floater_activeim.xml | 4 +- .../default/xui/de/floater_animation_preview.xml | 368 +- .../skins/default/xui/de/floater_auction.xml | 22 +- .../skins/default/xui/de/floater_avatar_picker.xml | 98 +- .../default/xui/de/floater_avatar_textures.xml | 84 +- .../skins/default/xui/de/floater_beacons.xml | 42 +- .../skins/default/xui/de/floater_build_options.xml | 22 +- .../skins/default/xui/de/floater_bulk_perms.xml | 108 +- .../newview/skins/default/xui/de/floater_bumps.xml | 48 +- .../skins/default/xui/de/floater_buy_contents.xml | 42 +- .../skins/default/xui/de/floater_buy_currency.xml | 132 +- .../skins/default/xui/de/floater_buy_land.xml | 474 +- .../skins/default/xui/de/floater_buy_object.xml | 52 +- .../skins/default/xui/de/floater_camera.xml | 62 +- .../skins/default/xui/de/floater_choose_group.xml | 16 +- .../skins/default/xui/de/floater_color_picker.xml | 62 +- .../skins/default/xui/de/floater_customize.xml | 1104 ++-- .../default/xui/de/floater_device_settings.xml | 4 +- .../skins/default/xui/de/floater_env_settings.xml | 52 +- .../default/xui/de/floater_first_time_tip.xml | 8 +- .../skins/default/xui/de/floater_font_test.xml | 12 +- .../skins/default/xui/de/floater_gesture.xml | 54 +- .../default/xui/de/floater_hardware_settings.xml | 56 +- .../skins/default/xui/de/floater_help_browser.xml | 28 +- indra/newview/skins/default/xui/de/floater_hud.xml | 4 +- indra/newview/skins/default/xui/de/floater_im.xml | 92 +- .../skins/default/xui/de/floater_im_container.xml | 4 +- .../skins/default/xui/de/floater_im_session.xml | 18 +- .../skins/default/xui/de/floater_image_preview.xml | 64 +- .../skins/default/xui/de/floater_incoming_call.xml | 42 +- .../skins/default/xui/de/floater_inspect.xml | 28 +- .../skins/default/xui/de/floater_inventory.xml | 32 +- .../xui/de/floater_inventory_item_properties.xml | 146 +- .../xui/de/floater_inventory_view_finder.xml | 48 +- .../skins/default/xui/de/floater_joystick.xml | 160 +- .../skins/default/xui/de/floater_lagmeter.xml | 302 +- .../skins/default/xui/de/floater_land_holdings.xml | 80 +- .../default/xui/de/floater_live_lsleditor.xml | 30 +- .../skins/default/xui/de/floater_lsl_guide.xml | 14 +- .../skins/default/xui/de/floater_media_browser.xml | 60 +- .../default/xui/de/floater_media_settings.xml | 12 +- .../skins/default/xui/de/floater_mem_leaking.xml | 36 +- .../skins/default/xui/de/floater_moveview.xml | 70 +- .../skins/default/xui/de/floater_mute_object.xml | 28 +- .../skins/default/xui/de/floater_my_friends.xml | 14 +- .../skins/default/xui/de/floater_nearby_chat.xml | 4 +- .../skins/default/xui/de/floater_notification.xml | 14 +- .../xui/de/floater_notifications_console.xml | 10 +- .../skins/default/xui/de/floater_openobject.xml | 16 +- .../skins/default/xui/de/floater_outgoing_call.xml | 56 +- indra/newview/skins/default/xui/de/floater_pay.xml | 50 +- .../skins/default/xui/de/floater_pay_object.xml | 58 +- .../skins/default/xui/de/floater_perm_prefs.xml | 32 +- .../skins/default/xui/de/floater_postcard.xml | 84 +- .../skins/default/xui/de/floater_preferences.xml | 30 +- .../default/xui/de/floater_preview_animation.xml | 24 +- .../default/xui/de/floater_preview_classified.xml | 12 +- .../skins/default/xui/de/floater_preview_event.xml | 12 +- .../default/xui/de/floater_preview_gesture.xml | 130 +- .../xui/de/floater_preview_gesture_info.xml | 4 +- .../xui/de/floater_preview_gesture_shortcut.xml | 30 +- .../xui/de/floater_preview_gesture_steps.xml | 4 +- .../default/xui/de/floater_preview_notecard.xml | 44 +- .../skins/default/xui/de/floater_preview_sound.xml | 22 +- .../default/xui/de/floater_preview_texture.xml | 92 +- .../skins/default/xui/de/floater_region_info.xml | 4 +- .../skins/default/xui/de/floater_report_abuse.xml | 208 +- .../default/xui/de/floater_script_debug_panel.xml | 4 +- .../default/xui/de/floater_script_preview.xml | 18 +- .../skins/default/xui/de/floater_script_queue.xml | 38 +- .../skins/default/xui/de/floater_script_search.xml | 26 +- .../skins/default/xui/de/floater_search.xml | 18 +- .../skins/default/xui/de/floater_sell_land.xml | 130 +- .../default/xui/de/floater_settings_debug.xml | 26 +- .../skins/default/xui/de/floater_snapshot.xml | 158 +- .../skins/default/xui/de/floater_sound_preview.xml | 40 +- .../skins/default/xui/de/floater_statistics.xml | 4 +- .../newview/skins/default/xui/de/floater_stats.xml | 142 +- .../skins/default/xui/de/floater_sys_well.xml | 4 +- .../skins/default/xui/de/floater_telehub.xml | 64 +- .../skins/default/xui/de/floater_texture_ctrl.xml | 48 +- .../newview/skins/default/xui/de/floater_tools.xml | 1000 +-- .../skins/default/xui/de/floater_top_objects.xml | 116 +- indra/newview/skins/default/xui/de/floater_tos.xml | 44 +- .../default/xui/de/floater_voice_controls.xml | 26 +- .../newview/skins/default/xui/de/floater_water.xml | 142 +- .../default/xui/de/floater_whitelist_entry.xml | 18 +- .../default/xui/de/floater_windlight_options.xml | 378 +- .../skins/default/xui/de/floater_world_map.xml | 106 +- .../skins/default/xui/de/inspect_avatar.xml | 56 +- .../newview/skins/default/xui/de/inspect_group.xml | 68 +- .../skins/default/xui/de/inspect_object.xml | 96 +- .../skins/default/xui/de/inspect_remote_object.xml | 50 +- .../skins/default/xui/de/menu_avatar_icon.xml | 14 +- .../skins/default/xui/de/menu_bottomtray.xml | 14 +- .../skins/default/xui/de/menu_favorites.xml | 20 +- .../skins/default/xui/de/menu_gesture_gear.xml | 20 +- .../skins/default/xui/de/menu_group_plus.xml | 10 +- .../skins/default/xui/de/menu_hide_navbar.xml | 10 +- .../skins/default/xui/de/menu_imchiclet_group.xml | 12 +- .../skins/default/xui/de/menu_imchiclet_p2p.xml | 14 +- .../default/xui/de/menu_inspect_avatar_gear.xml | 34 +- .../default/xui/de/menu_inspect_object_gear.xml | 34 +- .../default/xui/de/menu_inspect_self_gear.xml | 16 +- .../skins/default/xui/de/menu_inventory.xml | 164 +- .../skins/default/xui/de/menu_inventory_add.xml | 64 +- .../default/xui/de/menu_inventory_gear_default.xml | 24 +- .../newview/skins/default/xui/de/menu_landmark.xml | 14 +- indra/newview/skins/default/xui/de/menu_login.xml | 68 +- .../newview/skins/default/xui/de/menu_mini_map.xml | 18 +- indra/newview/skins/default/xui/de/menu_navbar.xml | 22 +- .../skins/default/xui/de/menu_nearby_chat.xml | 18 +- .../skins/default/xui/de/menu_object_icon.xml | 10 +- .../skins/default/xui/de/menu_participant_list.xml | 10 +- .../xui/de/menu_people_friends_view_sort.xml | 14 +- .../xui/de/menu_people_groups_view_sort.xml | 10 +- .../skins/default/xui/de/menu_people_nearby.xml | 20 +- .../xui/de/menu_people_nearby_multiselect.xml | 16 +- .../xui/de/menu_people_nearby_view_sort.xml | 16 +- .../xui/de/menu_people_recent_view_sort.xml | 14 +- indra/newview/skins/default/xui/de/menu_picks.xml | 16 +- .../skins/default/xui/de/menu_picks_plus.xml | 10 +- indra/newview/skins/default/xui/de/menu_place.xml | 14 +- .../skins/default/xui/de/menu_place_add_button.xml | 10 +- .../default/xui/de/menu_places_gear_folder.xml | 30 +- .../default/xui/de/menu_places_gear_landmark.xml | 36 +- .../skins/default/xui/de/menu_profile_overflow.xml | 10 +- indra/newview/skins/default/xui/de/menu_slurl.xml | 12 +- .../default/xui/de/menu_teleport_history_gear.xml | 12 +- .../default/xui/de/menu_teleport_history_item.xml | 12 +- .../default/xui/de/menu_teleport_history_tab.xml | 10 +- .../skins/default/xui/de/menu_text_editor.xml | 16 +- .../skins/default/xui/de/menu_url_agent.xml | 12 +- .../skins/default/xui/de/menu_url_group.xml | 12 +- .../newview/skins/default/xui/de/menu_url_http.xml | 14 +- .../skins/default/xui/de/menu_url_inventory.xml | 12 +- .../newview/skins/default/xui/de/menu_url_map.xml | 12 +- .../skins/default/xui/de/menu_url_objectim.xml | 16 +- .../skins/default/xui/de/menu_url_parcel.xml | 12 +- .../skins/default/xui/de/menu_url_slapp.xml | 10 +- .../skins/default/xui/de/menu_url_slurl.xml | 14 +- .../skins/default/xui/de/menu_url_teleport.xml | 12 +- indra/newview/skins/default/xui/de/menu_viewer.xml | 852 +-- .../newview/skins/default/xui/de/notifications.xml | 5270 ++++++++-------- .../skins/default/xui/de/panel_activeim_row.xml | 12 +- .../default/xui/de/panel_adhoc_control_panel.xml | 16 +- .../default/xui/de/panel_avatar_list_item.xml | 52 +- .../skins/default/xui/de/panel_avatar_tag.xml | 24 +- .../default/xui/de/panel_block_list_sidetray.xml | 20 +- .../skins/default/xui/de/panel_bottomtray.xml | 46 +- .../skins/default/xui/de/panel_chat_header.xml | 10 +- .../skins/default/xui/de/panel_classified_info.xml | 56 +- .../skins/default/xui/de/panel_edit_alpha.xml | 20 +- .../skins/default/xui/de/panel_edit_classified.xml | 82 +- .../skins/default/xui/de/panel_edit_eyes.xml | 18 +- .../skins/default/xui/de/panel_edit_gloves.xml | 20 +- .../skins/default/xui/de/panel_edit_hair.xml | 24 +- .../skins/default/xui/de/panel_edit_jacket.xml | 22 +- .../skins/default/xui/de/panel_edit_pants.xml | 20 +- .../skins/default/xui/de/panel_edit_pick.xml | 56 +- .../skins/default/xui/de/panel_edit_profile.xml | 112 +- .../skins/default/xui/de/panel_edit_shape.xml | 46 +- .../skins/default/xui/de/panel_edit_shirt.xml | 20 +- .../skins/default/xui/de/panel_edit_shoes.xml | 20 +- .../skins/default/xui/de/panel_edit_skin.xml | 28 +- .../skins/default/xui/de/panel_edit_skirt.xml | 20 +- .../skins/default/xui/de/panel_edit_socks.xml | 20 +- .../skins/default/xui/de/panel_edit_tattoo.xml | 16 +- .../skins/default/xui/de/panel_edit_underpants.xml | 20 +- .../skins/default/xui/de/panel_edit_undershirt.xml | 20 +- .../skins/default/xui/de/panel_edit_wearable.xml | 202 +- .../default/xui/de/panel_group_control_panel.xml | 18 +- .../skins/default/xui/de/panel_group_general.xml | 74 +- .../default/xui/de/panel_group_info_sidetray.xml | 72 +- .../skins/default/xui/de/panel_group_invite.xml | 58 +- .../default/xui/de/panel_group_land_money.xml | 340 +- .../skins/default/xui/de/panel_group_list_item.xml | 8 +- .../skins/default/xui/de/panel_group_notices.xml | 126 +- .../skins/default/xui/de/panel_group_notify.xml | 24 +- .../skins/default/xui/de/panel_group_roles.xml | 230 +- .../default/xui/de/panel_im_control_panel.xml | 26 +- .../skins/default/xui/de/panel_instant_message.xml | 22 +- .../skins/default/xui/de/panel_landmark_info.xml | 86 +- .../skins/default/xui/de/panel_landmarks.xml | 28 +- indra/newview/skins/default/xui/de/panel_login.xml | 82 +- .../skins/default/xui/de/panel_main_inventory.xml | 128 +- indra/newview/skins/default/xui/de/panel_me.xml | 14 +- .../xui/de/panel_media_settings_general.xml | 64 +- .../xui/de/panel_media_settings_permissions.xml | 18 +- .../xui/de/panel_media_settings_security.xml | 24 +- .../skins/default/xui/de/panel_my_profile.xml | 110 +- .../skins/default/xui/de/panel_navigation_bar.xml | 30 +- .../skins/default/xui/de/panel_nearby_chat.xml | 18 +- .../skins/default/xui/de/panel_nearby_chat_bar.xml | 22 +- indra/newview/skins/default/xui/de/panel_notes.xml | 46 +- .../default/xui/de/panel_outfits_inventory.xml | 26 +- .../de/panel_outfits_inventory_gear_default.xml | 12 +- .../newview/skins/default/xui/de/panel_people.xml | 106 +- .../skins/default/xui/de/panel_pick_info.xml | 32 +- indra/newview/skins/default/xui/de/panel_picks.xml | 42 +- .../skins/default/xui/de/panel_place_profile.xml | 258 +- .../newview/skins/default/xui/de/panel_places.xml | 28 +- .../default/xui/de/panel_preferences_advanced.xml | 96 +- .../default/xui/de/panel_preferences_alerts.xml | 28 +- .../default/xui/de/panel_preferences_chat.xml | 86 +- .../default/xui/de/panel_preferences_general.xml | 136 +- .../default/xui/de/panel_preferences_graphics1.xml | 232 +- .../default/xui/de/panel_preferences_privacy.xml | 54 +- .../default/xui/de/panel_preferences_setup.xml | 92 +- .../default/xui/de/panel_preferences_sound.xml | 76 +- .../default/xui/de/panel_prim_media_controls.xml | 66 +- .../newview/skins/default/xui/de/panel_profile.xml | 122 +- .../skins/default/xui/de/panel_profile_view.xml | 32 +- .../skins/default/xui/de/panel_region_covenant.xml | 166 +- .../skins/default/xui/de/panel_region_debug.xml | 80 +- .../skins/default/xui/de/panel_region_estate.xml | 150 +- .../skins/default/xui/de/panel_region_texture.xml | 116 +- .../skins/default/xui/de/panel_script_ed.xml | 86 +- .../skins/default/xui/de/panel_side_tray.xml | 52 +- .../default/xui/de/panel_side_tray_tab_caption.xml | 10 +- .../default/xui/de/panel_sidetray_home_tab.xml | 76 +- .../default/xui/de/panel_stand_stop_flying.xml | 12 +- .../skins/default/xui/de/panel_status_bar.xml | 58 +- .../skins/default/xui/de/panel_sys_well_item.xml | 14 +- .../default/xui/de/panel_teleport_history.xml | 30 +- .../default/xui/de/panel_teleport_history_item.xml | 8 +- .../skins/default/xui/de/panel_world_map.xml | 114 +- .../skins/default/xui/de/sidepanel_appearance.xml | 32 +- .../skins/default/xui/de/sidepanel_inventory.xml | 22 +- .../skins/default/xui/de/sidepanel_item_info.xml | 160 +- .../skins/default/xui/de/sidepanel_task_info.xml | 252 +- indra/newview/skins/default/xui/de/strings.xml | 6240 +++++++++---------- .../skins/default/xui/de/teleport_strings.xml | 156 +- .../skins/default/xui/en/floater_im_container.xml | 72 +- .../newview/skins/default/xui/fr/floater_about.xml | 160 +- .../skins/default/xui/fr/floater_about_land.xml | 966 +-- .../skins/default/xui/fr/floater_activeim.xml | 4 +- .../default/xui/fr/floater_animation_preview.xml | 370 +- .../skins/default/xui/fr/floater_auction.xml | 22 +- .../skins/default/xui/fr/floater_avatar_picker.xml | 94 +- .../default/xui/fr/floater_avatar_textures.xml | 84 +- .../skins/default/xui/fr/floater_beacons.xml | 42 +- .../skins/default/xui/fr/floater_build_options.xml | 22 +- .../skins/default/xui/fr/floater_bulk_perms.xml | 108 +- .../newview/skins/default/xui/fr/floater_bumps.xml | 48 +- .../skins/default/xui/fr/floater_buy_contents.xml | 42 +- .../skins/default/xui/fr/floater_buy_currency.xml | 132 +- .../skins/default/xui/fr/floater_buy_land.xml | 474 +- .../skins/default/xui/fr/floater_buy_object.xml | 52 +- .../skins/default/xui/fr/floater_camera.xml | 62 +- .../skins/default/xui/fr/floater_choose_group.xml | 16 +- .../skins/default/xui/fr/floater_color_picker.xml | 62 +- .../skins/default/xui/fr/floater_customize.xml | 1092 ++-- .../default/xui/fr/floater_device_settings.xml | 4 +- .../skins/default/xui/fr/floater_env_settings.xml | 58 +- .../default/xui/fr/floater_first_time_tip.xml | 8 +- .../skins/default/xui/fr/floater_font_test.xml | 12 +- .../skins/default/xui/fr/floater_gesture.xml | 54 +- .../default/xui/fr/floater_hardware_settings.xml | 56 +- .../skins/default/xui/fr/floater_help_browser.xml | 28 +- indra/newview/skins/default/xui/fr/floater_hud.xml | 4 +- indra/newview/skins/default/xui/fr/floater_im.xml | 90 +- .../skins/default/xui/fr/floater_im_container.xml | 4 +- .../skins/default/xui/fr/floater_im_session.xml | 18 +- .../skins/default/xui/fr/floater_image_preview.xml | 64 +- .../skins/default/xui/fr/floater_incoming_call.xml | 42 +- .../skins/default/xui/fr/floater_inspect.xml | 28 +- .../skins/default/xui/fr/floater_inventory.xml | 32 +- .../xui/fr/floater_inventory_item_properties.xml | 146 +- .../xui/fr/floater_inventory_view_finder.xml | 50 +- .../skins/default/xui/fr/floater_joystick.xml | 158 +- .../skins/default/xui/fr/floater_lagmeter.xml | 302 +- .../skins/default/xui/fr/floater_land_holdings.xml | 80 +- .../default/xui/fr/floater_live_lsleditor.xml | 30 +- .../skins/default/xui/fr/floater_lsl_guide.xml | 14 +- .../skins/default/xui/fr/floater_media_browser.xml | 62 +- .../default/xui/fr/floater_media_settings.xml | 12 +- .../skins/default/xui/fr/floater_mem_leaking.xml | 36 +- .../skins/default/xui/fr/floater_moveview.xml | 70 +- .../skins/default/xui/fr/floater_mute_object.xml | 28 +- .../skins/default/xui/fr/floater_my_friends.xml | 14 +- .../skins/default/xui/fr/floater_nearby_chat.xml | 4 +- .../skins/default/xui/fr/floater_notification.xml | 14 +- .../xui/fr/floater_notifications_console.xml | 10 +- .../skins/default/xui/fr/floater_openobject.xml | 16 +- .../skins/default/xui/fr/floater_outgoing_call.xml | 56 +- indra/newview/skins/default/xui/fr/floater_pay.xml | 52 +- .../skins/default/xui/fr/floater_pay_object.xml | 60 +- .../skins/default/xui/fr/floater_perm_prefs.xml | 32 +- .../skins/default/xui/fr/floater_postcard.xml | 86 +- .../skins/default/xui/fr/floater_preferences.xml | 30 +- .../default/xui/fr/floater_preview_animation.xml | 22 +- .../default/xui/fr/floater_preview_classified.xml | 12 +- .../skins/default/xui/fr/floater_preview_event.xml | 12 +- .../default/xui/fr/floater_preview_gesture.xml | 132 +- .../xui/fr/floater_preview_gesture_info.xml | 4 +- .../xui/fr/floater_preview_gesture_shortcut.xml | 30 +- .../xui/fr/floater_preview_gesture_steps.xml | 4 +- .../default/xui/fr/floater_preview_notecard.xml | 44 +- .../skins/default/xui/fr/floater_preview_sound.xml | 22 +- .../default/xui/fr/floater_preview_texture.xml | 92 +- .../skins/default/xui/fr/floater_region_info.xml | 4 +- .../skins/default/xui/fr/floater_report_abuse.xml | 206 +- .../default/xui/fr/floater_script_debug_panel.xml | 4 +- .../default/xui/fr/floater_script_preview.xml | 18 +- .../skins/default/xui/fr/floater_script_queue.xml | 38 +- .../skins/default/xui/fr/floater_script_search.xml | 30 +- .../skins/default/xui/fr/floater_search.xml | 18 +- .../skins/default/xui/fr/floater_sell_land.xml | 130 +- .../default/xui/fr/floater_settings_debug.xml | 26 +- .../skins/default/xui/fr/floater_snapshot.xml | 158 +- .../skins/default/xui/fr/floater_sound_preview.xml | 40 +- .../skins/default/xui/fr/floater_statistics.xml | 4 +- .../newview/skins/default/xui/fr/floater_stats.xml | 142 +- .../skins/default/xui/fr/floater_sys_well.xml | 4 +- .../skins/default/xui/fr/floater_telehub.xml | 62 +- .../skins/default/xui/fr/floater_texture_ctrl.xml | 48 +- .../newview/skins/default/xui/fr/floater_tools.xml | 994 +-- .../skins/default/xui/fr/floater_top_objects.xml | 110 +- indra/newview/skins/default/xui/fr/floater_tos.xml | 44 +- .../default/xui/fr/floater_voice_controls.xml | 26 +- .../newview/skins/default/xui/fr/floater_water.xml | 142 +- .../default/xui/fr/floater_whitelist_entry.xml | 18 +- .../default/xui/fr/floater_windlight_options.xml | 378 +- .../skins/default/xui/fr/floater_world_map.xml | 136 +- .../skins/default/xui/fr/inspect_avatar.xml | 56 +- .../newview/skins/default/xui/fr/inspect_group.xml | 68 +- .../skins/default/xui/fr/inspect_object.xml | 96 +- .../skins/default/xui/fr/inspect_remote_object.xml | 50 +- .../skins/default/xui/fr/menu_avatar_icon.xml | 14 +- .../skins/default/xui/fr/menu_bottomtray.xml | 14 +- .../skins/default/xui/fr/menu_favorites.xml | 20 +- .../skins/default/xui/fr/menu_gesture_gear.xml | 20 +- .../skins/default/xui/fr/menu_group_plus.xml | 10 +- .../skins/default/xui/fr/menu_hide_navbar.xml | 10 +- .../skins/default/xui/fr/menu_imchiclet_group.xml | 12 +- .../skins/default/xui/fr/menu_imchiclet_p2p.xml | 14 +- .../default/xui/fr/menu_inspect_avatar_gear.xml | 34 +- .../default/xui/fr/menu_inspect_object_gear.xml | 34 +- .../default/xui/fr/menu_inspect_self_gear.xml | 16 +- .../skins/default/xui/fr/menu_inventory.xml | 164 +- .../skins/default/xui/fr/menu_inventory_add.xml | 64 +- .../default/xui/fr/menu_inventory_gear_default.xml | 24 +- .../newview/skins/default/xui/fr/menu_landmark.xml | 14 +- indra/newview/skins/default/xui/fr/menu_login.xml | 68 +- .../newview/skins/default/xui/fr/menu_mini_map.xml | 18 +- indra/newview/skins/default/xui/fr/menu_navbar.xml | 22 +- .../skins/default/xui/fr/menu_nearby_chat.xml | 18 +- .../skins/default/xui/fr/menu_object_icon.xml | 10 +- .../skins/default/xui/fr/menu_participant_list.xml | 10 +- .../xui/fr/menu_people_friends_view_sort.xml | 14 +- .../xui/fr/menu_people_groups_view_sort.xml | 10 +- .../skins/default/xui/fr/menu_people_nearby.xml | 20 +- .../xui/fr/menu_people_nearby_multiselect.xml | 16 +- .../xui/fr/menu_people_nearby_view_sort.xml | 16 +- .../xui/fr/menu_people_recent_view_sort.xml | 14 +- indra/newview/skins/default/xui/fr/menu_picks.xml | 16 +- .../skins/default/xui/fr/menu_picks_plus.xml | 10 +- indra/newview/skins/default/xui/fr/menu_place.xml | 14 +- .../skins/default/xui/fr/menu_place_add_button.xml | 10 +- .../default/xui/fr/menu_places_gear_folder.xml | 30 +- .../default/xui/fr/menu_places_gear_landmark.xml | 36 +- .../skins/default/xui/fr/menu_profile_overflow.xml | 10 +- indra/newview/skins/default/xui/fr/menu_slurl.xml | 12 +- .../default/xui/fr/menu_teleport_history_gear.xml | 12 +- .../default/xui/fr/menu_teleport_history_item.xml | 12 +- .../default/xui/fr/menu_teleport_history_tab.xml | 10 +- .../skins/default/xui/fr/menu_text_editor.xml | 16 +- .../skins/default/xui/fr/menu_url_agent.xml | 12 +- .../skins/default/xui/fr/menu_url_group.xml | 12 +- .../newview/skins/default/xui/fr/menu_url_http.xml | 14 +- .../skins/default/xui/fr/menu_url_inventory.xml | 12 +- .../newview/skins/default/xui/fr/menu_url_map.xml | 12 +- .../skins/default/xui/fr/menu_url_objectim.xml | 16 +- .../skins/default/xui/fr/menu_url_parcel.xml | 12 +- .../skins/default/xui/fr/menu_url_slapp.xml | 10 +- .../skins/default/xui/fr/menu_url_slurl.xml | 14 +- .../skins/default/xui/fr/menu_url_teleport.xml | 12 +- indra/newview/skins/default/xui/fr/menu_viewer.xml | 852 +-- .../newview/skins/default/xui/fr/notifications.xml | 5234 ++++++++-------- .../skins/default/xui/fr/panel_activeim_row.xml | 12 +- .../default/xui/fr/panel_adhoc_control_panel.xml | 16 +- .../default/xui/fr/panel_avatar_list_item.xml | 52 +- .../skins/default/xui/fr/panel_avatar_tag.xml | 24 +- .../default/xui/fr/panel_block_list_sidetray.xml | 20 +- .../skins/default/xui/fr/panel_bottomtray.xml | 46 +- .../skins/default/xui/fr/panel_chat_header.xml | 10 +- .../skins/default/xui/fr/panel_classified_info.xml | 56 +- .../skins/default/xui/fr/panel_edit_alpha.xml | 20 +- .../skins/default/xui/fr/panel_edit_classified.xml | 82 +- .../skins/default/xui/fr/panel_edit_eyes.xml | 18 +- .../skins/default/xui/fr/panel_edit_gloves.xml | 20 +- .../skins/default/xui/fr/panel_edit_hair.xml | 24 +- .../skins/default/xui/fr/panel_edit_jacket.xml | 22 +- .../skins/default/xui/fr/panel_edit_pants.xml | 20 +- .../skins/default/xui/fr/panel_edit_pick.xml | 56 +- .../skins/default/xui/fr/panel_edit_profile.xml | 112 +- .../skins/default/xui/fr/panel_edit_shape.xml | 46 +- .../skins/default/xui/fr/panel_edit_shirt.xml | 20 +- .../skins/default/xui/fr/panel_edit_shoes.xml | 20 +- .../skins/default/xui/fr/panel_edit_skin.xml | 28 +- .../skins/default/xui/fr/panel_edit_skirt.xml | 20 +- .../skins/default/xui/fr/panel_edit_socks.xml | 20 +- .../skins/default/xui/fr/panel_edit_tattoo.xml | 16 +- .../skins/default/xui/fr/panel_edit_underpants.xml | 20 +- .../skins/default/xui/fr/panel_edit_undershirt.xml | 20 +- .../skins/default/xui/fr/panel_edit_wearable.xml | 202 +- .../default/xui/fr/panel_group_control_panel.xml | 18 +- .../skins/default/xui/fr/panel_group_general.xml | 74 +- .../default/xui/fr/panel_group_info_sidetray.xml | 72 +- .../skins/default/xui/fr/panel_group_invite.xml | 58 +- .../default/xui/fr/panel_group_land_money.xml | 168 +- .../skins/default/xui/fr/panel_group_list_item.xml | 8 +- .../skins/default/xui/fr/panel_group_notices.xml | 134 +- .../skins/default/xui/fr/panel_group_notify.xml | 24 +- .../skins/default/xui/fr/panel_group_roles.xml | 226 +- .../default/xui/fr/panel_im_control_panel.xml | 26 +- .../skins/default/xui/fr/panel_instant_message.xml | 22 +- .../skins/default/xui/fr/panel_landmark_info.xml | 86 +- .../skins/default/xui/fr/panel_landmarks.xml | 28 +- indra/newview/skins/default/xui/fr/panel_login.xml | 82 +- .../skins/default/xui/fr/panel_main_inventory.xml | 128 +- indra/newview/skins/default/xui/fr/panel_me.xml | 14 +- .../xui/fr/panel_media_settings_general.xml | 80 +- .../xui/fr/panel_media_settings_permissions.xml | 18 +- .../xui/fr/panel_media_settings_security.xml | 12 +- .../skins/default/xui/fr/panel_my_profile.xml | 110 +- .../skins/default/xui/fr/panel_navigation_bar.xml | 24 +- .../skins/default/xui/fr/panel_nearby_chat.xml | 18 +- .../skins/default/xui/fr/panel_nearby_chat_bar.xml | 22 +- indra/newview/skins/default/xui/fr/panel_notes.xml | 46 +- .../default/xui/fr/panel_outfits_inventory.xml | 26 +- .../fr/panel_outfits_inventory_gear_default.xml | 12 +- .../newview/skins/default/xui/fr/panel_people.xml | 106 +- .../skins/default/xui/fr/panel_pick_info.xml | 32 +- indra/newview/skins/default/xui/fr/panel_picks.xml | 42 +- .../skins/default/xui/fr/panel_place_profile.xml | 258 +- .../newview/skins/default/xui/fr/panel_places.xml | 28 +- .../default/xui/fr/panel_preferences_advanced.xml | 96 +- .../default/xui/fr/panel_preferences_alerts.xml | 28 +- .../default/xui/fr/panel_preferences_chat.xml | 86 +- .../default/xui/fr/panel_preferences_general.xml | 136 +- .../default/xui/fr/panel_preferences_graphics1.xml | 232 +- .../default/xui/fr/panel_preferences_privacy.xml | 56 +- .../default/xui/fr/panel_preferences_setup.xml | 92 +- .../default/xui/fr/panel_preferences_sound.xml | 76 +- .../default/xui/fr/panel_prim_media_controls.xml | 66 +- .../newview/skins/default/xui/fr/panel_profile.xml | 122 +- .../skins/default/xui/fr/panel_profile_view.xml | 32 +- .../skins/default/xui/fr/panel_region_covenant.xml | 164 +- .../skins/default/xui/fr/panel_region_debug.xml | 80 +- .../skins/default/xui/fr/panel_region_estate.xml | 156 +- .../skins/default/xui/fr/panel_region_texture.xml | 146 +- .../skins/default/xui/fr/panel_script_ed.xml | 86 +- .../skins/default/xui/fr/panel_side_tray.xml | 52 +- .../default/xui/fr/panel_side_tray_tab_caption.xml | 10 +- .../default/xui/fr/panel_sidetray_home_tab.xml | 76 +- .../default/xui/fr/panel_stand_stop_flying.xml | 12 +- .../skins/default/xui/fr/panel_status_bar.xml | 58 +- .../skins/default/xui/fr/panel_sys_well_item.xml | 14 +- .../default/xui/fr/panel_teleport_history.xml | 30 +- .../default/xui/fr/panel_teleport_history_item.xml | 8 +- .../skins/default/xui/fr/panel_world_map.xml | 114 +- .../skins/default/xui/fr/sidepanel_appearance.xml | 32 +- .../skins/default/xui/fr/sidepanel_inventory.xml | 22 +- .../skins/default/xui/fr/sidepanel_item_info.xml | 160 +- .../skins/default/xui/fr/sidepanel_task_info.xml | 252 +- indra/newview/skins/default/xui/fr/strings.xml | 6240 +++++++++---------- .../skins/default/xui/fr/teleport_strings.xml | 154 +- .../newview/skins/default/xui/ja/floater_about.xml | 160 +- .../skins/default/xui/ja/floater_about_land.xml | 956 +-- .../skins/default/xui/ja/floater_activeim.xml | 4 +- .../default/xui/ja/floater_animation_preview.xml | 366 +- .../skins/default/xui/ja/floater_auction.xml | 22 +- .../skins/default/xui/ja/floater_avatar_picker.xml | 92 +- .../default/xui/ja/floater_avatar_textures.xml | 84 +- .../skins/default/xui/ja/floater_beacons.xml | 42 +- .../skins/default/xui/ja/floater_build_options.xml | 22 +- .../skins/default/xui/ja/floater_bulk_perms.xml | 108 +- .../newview/skins/default/xui/ja/floater_bumps.xml | 48 +- .../skins/default/xui/ja/floater_buy_contents.xml | 44 +- .../skins/default/xui/ja/floater_buy_currency.xml | 132 +- .../skins/default/xui/ja/floater_buy_land.xml | 474 +- .../skins/default/xui/ja/floater_buy_object.xml | 52 +- .../skins/default/xui/ja/floater_camera.xml | 62 +- .../skins/default/xui/ja/floater_choose_group.xml | 16 +- .../skins/default/xui/ja/floater_color_picker.xml | 62 +- .../skins/default/xui/ja/floater_customize.xml | 1078 ++-- .../default/xui/ja/floater_device_settings.xml | 4 +- .../skins/default/xui/ja/floater_env_settings.xml | 50 +- .../default/xui/ja/floater_first_time_tip.xml | 8 +- .../skins/default/xui/ja/floater_font_test.xml | 12 +- .../skins/default/xui/ja/floater_gesture.xml | 54 +- .../default/xui/ja/floater_hardware_settings.xml | 56 +- .../skins/default/xui/ja/floater_help_browser.xml | 28 +- indra/newview/skins/default/xui/ja/floater_hud.xml | 4 +- indra/newview/skins/default/xui/ja/floater_im.xml | 92 +- .../skins/default/xui/ja/floater_im_container.xml | 4 +- .../skins/default/xui/ja/floater_im_session.xml | 18 +- .../skins/default/xui/ja/floater_image_preview.xml | 64 +- .../skins/default/xui/ja/floater_incoming_call.xml | 42 +- .../skins/default/xui/ja/floater_inspect.xml | 28 +- .../skins/default/xui/ja/floater_inventory.xml | 32 +- .../xui/ja/floater_inventory_item_properties.xml | 146 +- .../xui/ja/floater_inventory_view_finder.xml | 48 +- .../skins/default/xui/ja/floater_joystick.xml | 238 +- .../skins/default/xui/ja/floater_lagmeter.xml | 302 +- .../skins/default/xui/ja/floater_land_holdings.xml | 80 +- .../default/xui/ja/floater_live_lsleditor.xml | 30 +- .../skins/default/xui/ja/floater_lsl_guide.xml | 14 +- .../skins/default/xui/ja/floater_media_browser.xml | 60 +- .../default/xui/ja/floater_media_settings.xml | 12 +- .../skins/default/xui/ja/floater_mem_leaking.xml | 36 +- .../skins/default/xui/ja/floater_moveview.xml | 70 +- .../skins/default/xui/ja/floater_mute_object.xml | 28 +- .../skins/default/xui/ja/floater_my_friends.xml | 14 +- .../skins/default/xui/ja/floater_nearby_chat.xml | 4 +- .../skins/default/xui/ja/floater_notification.xml | 14 +- .../xui/ja/floater_notifications_console.xml | 10 +- .../skins/default/xui/ja/floater_openobject.xml | 16 +- .../skins/default/xui/ja/floater_outgoing_call.xml | 56 +- indra/newview/skins/default/xui/ja/floater_pay.xml | 50 +- .../skins/default/xui/ja/floater_pay_object.xml | 58 +- .../skins/default/xui/ja/floater_perm_prefs.xml | 32 +- .../skins/default/xui/ja/floater_postcard.xml | 84 +- .../skins/default/xui/ja/floater_preferences.xml | 30 +- .../default/xui/ja/floater_preview_animation.xml | 22 +- .../default/xui/ja/floater_preview_classified.xml | 12 +- .../skins/default/xui/ja/floater_preview_event.xml | 12 +- .../default/xui/ja/floater_preview_gesture.xml | 130 +- .../xui/ja/floater_preview_gesture_info.xml | 4 +- .../xui/ja/floater_preview_gesture_shortcut.xml | 30 +- .../xui/ja/floater_preview_gesture_steps.xml | 4 +- .../default/xui/ja/floater_preview_notecard.xml | 44 +- .../skins/default/xui/ja/floater_preview_sound.xml | 22 +- .../default/xui/ja/floater_preview_texture.xml | 92 +- .../skins/default/xui/ja/floater_region_info.xml | 4 +- .../skins/default/xui/ja/floater_report_abuse.xml | 206 +- .../default/xui/ja/floater_script_debug_panel.xml | 4 +- .../default/xui/ja/floater_script_preview.xml | 18 +- .../skins/default/xui/ja/floater_script_queue.xml | 38 +- .../skins/default/xui/ja/floater_script_search.xml | 26 +- .../skins/default/xui/ja/floater_search.xml | 18 +- .../skins/default/xui/ja/floater_sell_land.xml | 130 +- .../default/xui/ja/floater_settings_debug.xml | 26 +- .../skins/default/xui/ja/floater_snapshot.xml | 158 +- .../skins/default/xui/ja/floater_sound_preview.xml | 40 +- .../skins/default/xui/ja/floater_statistics.xml | 4 +- .../newview/skins/default/xui/ja/floater_stats.xml | 142 +- .../skins/default/xui/ja/floater_sys_well.xml | 4 +- .../skins/default/xui/ja/floater_telehub.xml | 56 +- .../skins/default/xui/ja/floater_texture_ctrl.xml | 48 +- .../newview/skins/default/xui/ja/floater_tools.xml | 994 +-- .../skins/default/xui/ja/floater_top_objects.xml | 110 +- indra/newview/skins/default/xui/ja/floater_tos.xml | 44 +- .../default/xui/ja/floater_voice_controls.xml | 26 +- .../newview/skins/default/xui/ja/floater_water.xml | 140 +- .../default/xui/ja/floater_whitelist_entry.xml | 18 +- .../default/xui/ja/floater_windlight_options.xml | 378 +- .../skins/default/xui/ja/floater_world_map.xml | 108 +- .../skins/default/xui/ja/inspect_avatar.xml | 56 +- .../newview/skins/default/xui/ja/inspect_group.xml | 68 +- .../skins/default/xui/ja/inspect_object.xml | 96 +- .../skins/default/xui/ja/inspect_remote_object.xml | 50 +- .../skins/default/xui/ja/menu_avatar_icon.xml | 14 +- .../skins/default/xui/ja/menu_bottomtray.xml | 14 +- .../skins/default/xui/ja/menu_favorites.xml | 20 +- .../skins/default/xui/ja/menu_gesture_gear.xml | 20 +- .../skins/default/xui/ja/menu_group_plus.xml | 10 +- .../skins/default/xui/ja/menu_hide_navbar.xml | 10 +- .../skins/default/xui/ja/menu_imchiclet_group.xml | 12 +- .../skins/default/xui/ja/menu_imchiclet_p2p.xml | 14 +- .../default/xui/ja/menu_inspect_avatar_gear.xml | 34 +- .../default/xui/ja/menu_inspect_object_gear.xml | 34 +- .../default/xui/ja/menu_inspect_self_gear.xml | 16 +- .../skins/default/xui/ja/menu_inventory.xml | 164 +- .../skins/default/xui/ja/menu_inventory_add.xml | 64 +- .../default/xui/ja/menu_inventory_gear_default.xml | 24 +- .../newview/skins/default/xui/ja/menu_landmark.xml | 14 +- indra/newview/skins/default/xui/ja/menu_login.xml | 68 +- .../newview/skins/default/xui/ja/menu_mini_map.xml | 18 +- indra/newview/skins/default/xui/ja/menu_navbar.xml | 22 +- .../skins/default/xui/ja/menu_nearby_chat.xml | 18 +- .../skins/default/xui/ja/menu_object_icon.xml | 10 +- .../skins/default/xui/ja/menu_participant_list.xml | 10 +- .../xui/ja/menu_people_friends_view_sort.xml | 14 +- .../xui/ja/menu_people_groups_view_sort.xml | 10 +- .../skins/default/xui/ja/menu_people_nearby.xml | 20 +- .../xui/ja/menu_people_nearby_multiselect.xml | 16 +- .../xui/ja/menu_people_nearby_view_sort.xml | 16 +- .../xui/ja/menu_people_recent_view_sort.xml | 14 +- indra/newview/skins/default/xui/ja/menu_picks.xml | 16 +- .../skins/default/xui/ja/menu_picks_plus.xml | 10 +- indra/newview/skins/default/xui/ja/menu_place.xml | 14 +- .../skins/default/xui/ja/menu_place_add_button.xml | 10 +- .../default/xui/ja/menu_places_gear_folder.xml | 30 +- .../default/xui/ja/menu_places_gear_landmark.xml | 36 +- .../skins/default/xui/ja/menu_profile_overflow.xml | 10 +- indra/newview/skins/default/xui/ja/menu_slurl.xml | 12 +- .../default/xui/ja/menu_teleport_history_gear.xml | 12 +- .../default/xui/ja/menu_teleport_history_item.xml | 12 +- .../default/xui/ja/menu_teleport_history_tab.xml | 10 +- .../skins/default/xui/ja/menu_text_editor.xml | 16 +- .../skins/default/xui/ja/menu_url_agent.xml | 12 +- .../skins/default/xui/ja/menu_url_group.xml | 12 +- .../newview/skins/default/xui/ja/menu_url_http.xml | 14 +- .../skins/default/xui/ja/menu_url_inventory.xml | 12 +- .../newview/skins/default/xui/ja/menu_url_map.xml | 12 +- .../skins/default/xui/ja/menu_url_objectim.xml | 16 +- .../skins/default/xui/ja/menu_url_parcel.xml | 12 +- .../skins/default/xui/ja/menu_url_slapp.xml | 10 +- .../skins/default/xui/ja/menu_url_slurl.xml | 14 +- .../skins/default/xui/ja/menu_url_teleport.xml | 12 +- indra/newview/skins/default/xui/ja/menu_viewer.xml | 852 +-- .../newview/skins/default/xui/ja/notifications.xml | 5412 ++++++++-------- .../skins/default/xui/ja/panel_activeim_row.xml | 12 +- .../default/xui/ja/panel_adhoc_control_panel.xml | 16 +- .../default/xui/ja/panel_avatar_list_item.xml | 52 +- .../skins/default/xui/ja/panel_avatar_tag.xml | 24 +- .../default/xui/ja/panel_block_list_sidetray.xml | 20 +- .../skins/default/xui/ja/panel_bottomtray.xml | 46 +- .../skins/default/xui/ja/panel_chat_header.xml | 10 +- .../skins/default/xui/ja/panel_classified_info.xml | 56 +- .../skins/default/xui/ja/panel_edit_alpha.xml | 20 +- .../skins/default/xui/ja/panel_edit_classified.xml | 82 +- .../skins/default/xui/ja/panel_edit_eyes.xml | 18 +- .../skins/default/xui/ja/panel_edit_gloves.xml | 20 +- .../skins/default/xui/ja/panel_edit_hair.xml | 24 +- .../skins/default/xui/ja/panel_edit_jacket.xml | 22 +- .../skins/default/xui/ja/panel_edit_pants.xml | 20 +- .../skins/default/xui/ja/panel_edit_pick.xml | 56 +- .../skins/default/xui/ja/panel_edit_profile.xml | 112 +- .../skins/default/xui/ja/panel_edit_shape.xml | 46 +- .../skins/default/xui/ja/panel_edit_shirt.xml | 20 +- .../skins/default/xui/ja/panel_edit_shoes.xml | 20 +- .../skins/default/xui/ja/panel_edit_skin.xml | 28 +- .../skins/default/xui/ja/panel_edit_skirt.xml | 20 +- .../skins/default/xui/ja/panel_edit_socks.xml | 20 +- .../skins/default/xui/ja/panel_edit_tattoo.xml | 16 +- .../skins/default/xui/ja/panel_edit_underpants.xml | 20 +- .../skins/default/xui/ja/panel_edit_undershirt.xml | 20 +- .../skins/default/xui/ja/panel_edit_wearable.xml | 202 +- .../default/xui/ja/panel_group_control_panel.xml | 18 +- .../skins/default/xui/ja/panel_group_general.xml | 74 +- .../default/xui/ja/panel_group_info_sidetray.xml | 72 +- .../skins/default/xui/ja/panel_group_invite.xml | 60 +- .../default/xui/ja/panel_group_land_money.xml | 168 +- .../skins/default/xui/ja/panel_group_list_item.xml | 8 +- .../skins/default/xui/ja/panel_group_notices.xml | 126 +- .../skins/default/xui/ja/panel_group_notify.xml | 24 +- .../skins/default/xui/ja/panel_group_roles.xml | 230 +- .../default/xui/ja/panel_im_control_panel.xml | 26 +- .../skins/default/xui/ja/panel_instant_message.xml | 22 +- .../skins/default/xui/ja/panel_landmark_info.xml | 86 +- .../skins/default/xui/ja/panel_landmarks.xml | 28 +- indra/newview/skins/default/xui/ja/panel_login.xml | 82 +- .../skins/default/xui/ja/panel_main_inventory.xml | 128 +- indra/newview/skins/default/xui/ja/panel_me.xml | 14 +- .../xui/ja/panel_media_settings_general.xml | 80 +- .../xui/ja/panel_media_settings_permissions.xml | 18 +- .../xui/ja/panel_media_settings_security.xml | 12 +- .../skins/default/xui/ja/panel_my_profile.xml | 110 +- .../skins/default/xui/ja/panel_navigation_bar.xml | 24 +- .../skins/default/xui/ja/panel_nearby_chat.xml | 18 +- .../skins/default/xui/ja/panel_nearby_chat_bar.xml | 22 +- indra/newview/skins/default/xui/ja/panel_notes.xml | 46 +- .../default/xui/ja/panel_outfits_inventory.xml | 26 +- .../ja/panel_outfits_inventory_gear_default.xml | 12 +- .../newview/skins/default/xui/ja/panel_people.xml | 106 +- .../skins/default/xui/ja/panel_pick_info.xml | 32 +- indra/newview/skins/default/xui/ja/panel_picks.xml | 42 +- .../skins/default/xui/ja/panel_place_profile.xml | 258 +- .../newview/skins/default/xui/ja/panel_places.xml | 28 +- .../default/xui/ja/panel_preferences_advanced.xml | 96 +- .../default/xui/ja/panel_preferences_alerts.xml | 28 +- .../default/xui/ja/panel_preferences_chat.xml | 86 +- .../default/xui/ja/panel_preferences_general.xml | 136 +- .../default/xui/ja/panel_preferences_graphics1.xml | 232 +- .../default/xui/ja/panel_preferences_privacy.xml | 54 +- .../default/xui/ja/panel_preferences_setup.xml | 92 +- .../default/xui/ja/panel_preferences_sound.xml | 76 +- .../default/xui/ja/panel_prim_media_controls.xml | 66 +- .../newview/skins/default/xui/ja/panel_profile.xml | 122 +- .../skins/default/xui/ja/panel_profile_view.xml | 32 +- .../skins/default/xui/ja/panel_region_covenant.xml | 160 +- .../skins/default/xui/ja/panel_region_debug.xml | 80 +- .../skins/default/xui/ja/panel_region_estate.xml | 150 +- .../skins/default/xui/ja/panel_region_texture.xml | 116 +- .../skins/default/xui/ja/panel_script_ed.xml | 86 +- .../skins/default/xui/ja/panel_side_tray.xml | 52 +- .../default/xui/ja/panel_side_tray_tab_caption.xml | 10 +- .../default/xui/ja/panel_sidetray_home_tab.xml | 76 +- .../default/xui/ja/panel_stand_stop_flying.xml | 12 +- .../skins/default/xui/ja/panel_status_bar.xml | 58 +- .../skins/default/xui/ja/panel_sys_well_item.xml | 14 +- .../default/xui/ja/panel_teleport_history.xml | 30 +- .../default/xui/ja/panel_teleport_history_item.xml | 8 +- .../skins/default/xui/ja/panel_world_map.xml | 114 +- .../skins/default/xui/ja/sidepanel_appearance.xml | 32 +- .../skins/default/xui/ja/sidepanel_inventory.xml | 22 +- .../skins/default/xui/ja/sidepanel_item_info.xml | 160 +- .../skins/default/xui/ja/sidepanel_task_info.xml | 252 +- indra/newview/skins/default/xui/ja/strings.xml | 6240 +++++++++---------- .../skins/default/xui/ja/teleport_strings.xml | 158 +- 725 files changed, 46565 insertions(+), 46565 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index cdf1915d5e..faa24b5877 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -1,81 +1,81 @@ - - - - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) -[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - Bygget med [COMPILER] version [COMPILER_VERSION] - - - Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i [REGION] lokaliseret på [HOSTNAME] ([HOSTIP]) -[SERVER_VERSION] -[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - CPU: [CPU] -Memory: [MEMORY_MB] MB -OS Version: [OS_VERSION] -Grafik kort mærke: [GRAPHICS_CARD_VENDOR] -Grafik kort: [GRAPHICS_CARD] - - - Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION] - - - OpenGL Version: [OPENGL_VERSION] - -libcurl Version: [LIBCURL_VERSION] -J2C Decoder Version: [J2C_VERSION] -Audio Driver Version: [AUDIO_DRIVER_VERSION] -Qt Webkit Version: [QT_WEBKIT_VERSION] -Vivox Version: [VIVOX_VERSION] - - - (ingen) - - - Pakker tabt: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) - - - -