From 73ac76a0eb8fcab41ac87600a6ee0cd833c22c7b Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Tue, 16 Sep 2014 20:33:37 -0400 Subject: [PATCH 01/17] LLDropTarget should accept link targets instead of links Also stylization changes --- indra/newview/lldroptarget.cpp | 28 ++++++++++++---------------- indra/newview/lldroptarget.h | 1 - 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp index 9e7cc377e..997e53da5 100644 --- a/indra/newview/lldroptarget.cpp +++ b/indra/newview/lldroptarget.cpp @@ -46,7 +46,7 @@ static LLRegisterWidget r("drop_target"); -static std::string currently_set_to(const LLViewerInventoryItem* item) +std::string currently_set_to(const LLViewerInventoryItem* item) { LLStringUtil::format_map_t args; args["[ITEM]"] = item->getName(); @@ -84,7 +84,7 @@ LLDropTarget::~LLDropTarget() // static LLView* LLDropTarget::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory* factory) { - LLDropTarget* target = new LLDropTarget(); + LLDropTarget* target = new LLDropTarget; target->initFromXML(node, parent); return target; } @@ -188,23 +188,19 @@ void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data) BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) { - if (mEntityID.isNull()) + if (mEntityID.notNull()) + return getParent() ? LLToolDragAndDrop::handleGiveDragAndDrop(mEntityID, LLUUID::null, drop, cargo_type, cargo_data, accept) : false; + + if (LLViewerInventoryItem* inv_item = static_cast(cargo_data)) { - if (LLViewerInventoryItem* inv_item = static_cast(cargo_data)) + *accept = ACCEPT_YES_COPY_SINGLE; + if (drop) { - *accept = ACCEPT_YES_COPY_SINGLE; - if (drop) - { - mText->setText(currently_set_to(inv_item)); - if (mControl) mControl->setValue(inv_item->getUUID().asString()); - } + mText->setText(currently_set_to(inv_item)); + if (mControl) + mControl->setValue(inv_item->getLinkedUUID().asString()); } - else - { - *accept = ACCEPT_NO; - } - return true; } - return getParent() ? LLToolDragAndDrop::handleGiveDragAndDrop(mEntityID, LLUUID::null, drop, cargo_type, cargo_data, accept) : false; + return true; } diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h index 08026bd2a..448208965 100644 --- a/indra/newview/lldroptarget.h +++ b/indra/newview/lldroptarget.h @@ -75,7 +75,6 @@ public: void setEntityID(const LLUUID& id) { mEntityID = id;} protected: LLUUID mEntityID; -private: class LLViewBorder* mBorder; LLControlVariable* mControl; class LLTextBox* mText; From 3555967812ba49390d90af9c5010cce97a81fdc0 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 30 Sep 2014 18:09:26 +0200 Subject: [PATCH 02/17] Write for assets in "My Inventory" folder too. --- indra/newview/aixmllindengenepool.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/aixmllindengenepool.cpp b/indra/newview/aixmllindengenepool.cpp index b02d4b60d..cbb6659d9 100644 --- a/indra/newview/aixmllindengenepool.cpp +++ b/indra/newview/aixmllindengenepool.cpp @@ -171,7 +171,9 @@ void AIArchetype::toXML(std::ostream& os, int indentation) const { tag.attribute("name", LLWearableType::getTypeName(mType)); } - if (!mMetaData.mPath.empty()) + // mMetaData.mPath can be empty even exporting from the Appearance editor: + // when the asset is in the "My Inventory" root. + if (!mMetaData.mPath.empty() || !mMetaData.mName.empty()) // Is this not an old-style linden_genepool? { tag.child(mMetaData); } From 3b631a4f90957b1045ceccb6e4f2b83e9b9c1a20 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 18 Sep 2014 19:50:23 -0400 Subject: [PATCH 03/17] Back out of droptarget support for links. Drag and drop support for links would have to be done in lltooldraganddrop, and would probably require a rework there. --- indra/newview/lldroptarget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp index 997e53da5..51897a4be 100644 --- a/indra/newview/lldroptarget.cpp +++ b/indra/newview/lldroptarget.cpp @@ -198,7 +198,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAn { mText->setText(currently_set_to(inv_item)); if (mControl) - mControl->setValue(inv_item->getLinkedUUID().asString()); + mControl->setValue(inv_item->getUUID().asString()); } } return true; From d2dd03dcba3cd4d09c8b9efe715759024b339425 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 18 Sep 2014 21:31:41 -0400 Subject: [PATCH 04/17] War on std::string::find compares against -1 instead of std::string::npos --- indra/newview/ascentprefschat.cpp | 4 ++-- indra/newview/importtracker.cpp | 4 ++-- indra/newview/jcfloaterareasearch.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index 3f50e53b6..8862d1604 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -226,7 +226,7 @@ void LLPrefsAscentChat::refreshValues() mSecondsInLog = gSavedSettings.getBOOL("SecondsInLog"); std::string format = gSavedSettings.getString("ShortTimeFormat"); - if (format.find("%p") == -1) + if (format.find("%p") == std::string::npos) { mTimeFormat = 0; } @@ -236,7 +236,7 @@ void LLPrefsAscentChat::refreshValues() } format = gSavedSettings.getString("ShortDateFormat"); - if (format.find("%m/%d/%") != -1) + if (format.find("%m/%d/%") != std::string::npos) { mDateFormat = 2; } diff --git a/indra/newview/importtracker.cpp b/indra/newview/importtracker.cpp index 4b8a7e843..bddbf790e 100644 --- a/indra/newview/importtracker.cpp +++ b/indra/newview/importtracker.cpp @@ -507,10 +507,10 @@ public: gVFS->getData(data->assetid, data->type, buffer, 0, size); std::string script((char*)buffer); BOOL domono = FALSE;//Phox- this needs to be fixed when the preproc is added = JCLSLPreprocessor::mono_directive(script); - *//*if(script.find("//mono\n") != -1) + *//*if(script.find("//mono\n") != std::string::npos) { domono = TRUE; - }else if(script.find("//lsl2\n") != -1) + }else if(script.find("//lsl2\n") != std::string::npos) { domono = FALSE; }*//* diff --git a/indra/newview/jcfloaterareasearch.cpp b/indra/newview/jcfloaterareasearch.cpp index 8b1ac9d77..3beacdf3d 100644 --- a/indra/newview/jcfloaterareasearch.cpp +++ b/indra/newview/jcfloaterareasearch.cpp @@ -221,10 +221,10 @@ void JCFloaterAreaSearch::results() LLStringUtil::toLower(object_desc); LLStringUtil::toLower(object_owner); LLStringUtil::toLower(object_group); - if ((mFilterStrings[LIST_OBJECT_NAME].empty() || object_name.find(mFilterStrings[LIST_OBJECT_NAME]) != -1) && - (mFilterStrings[LIST_OBJECT_DESC].empty() || object_desc.find(mFilterStrings[LIST_OBJECT_DESC]) != -1) && - (mFilterStrings[LIST_OBJECT_OWNER].empty() || object_owner.find(mFilterStrings[LIST_OBJECT_OWNER]) != -1) && - (mFilterStrings[LIST_OBJECT_GROUP].empty() || object_group.find(mFilterStrings[LIST_OBJECT_GROUP]) != -1)) + if ((mFilterStrings[LIST_OBJECT_NAME].empty() || object_name.find(mFilterStrings[LIST_OBJECT_NAME]) != std::string::npos) && + (mFilterStrings[LIST_OBJECT_DESC].empty() || object_desc.find(mFilterStrings[LIST_OBJECT_DESC]) != std::string::npos) && + (mFilterStrings[LIST_OBJECT_OWNER].empty() || object_owner.find(mFilterStrings[LIST_OBJECT_OWNER]) != std::string::npos) && + (mFilterStrings[LIST_OBJECT_GROUP].empty() || object_group.find(mFilterStrings[LIST_OBJECT_GROUP]) != std::string::npos)) { //llinfos << "pass" << llendl; LLSD element; From 06584a38ab1a586282faf74dfd510d3a02da0520 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Wed, 1 Oct 2014 18:34:26 -0400 Subject: [PATCH 05/17] Stylistic changes and whatnot for LLDropTarget what with setValue and setItem --- indra/newview/lldroptarget.cpp | 30 +++++++++++++++++++++++------- indra/newview/lldroptarget.h | 7 ++++++- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp index 51897a4be..9ae950db9 100644 --- a/indra/newview/lldroptarget.cpp +++ b/indra/newview/lldroptarget.cpp @@ -46,8 +46,9 @@ static LLRegisterWidget r("drop_target"); -std::string currently_set_to(const LLViewerInventoryItem* item) +std::string currently_set_to(const LLInventoryItem* item) { + if (!item) return LLTrans::getString("CurrentlyNotSet"); LLStringUtil::format_map_t args; args["[ITEM]"] = item->getName(); return LLTrans::getString("CurrentlySetTo", args); @@ -181,6 +182,26 @@ void LLDropTarget::fillParent(const LLView* parent) setRect(LLRect(0, parent_rect.getHeight(), parent_rect.getWidth(), 0)); } +void LLDropTarget::setControlValue(const std::string& val) +{ + if (mControl) + { + mControl->setValue(val); + } +} + +void LLDropTarget::setItem(const LLInventoryItem* item) +{ + mText->setText(currently_set_to(item)); + setControlValue(item ? item->getUUID().asString() : ""); +} + +void LLDropTarget::setValue(const LLSD& value) +{ + const LLUUID& id(value.asUUID()); + setItem(id.isNull() ? NULL : gInventory.getItem(id)); +} + void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data) { llinfos << "LLDropTarget::doDrop()" << llendl; @@ -194,12 +215,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAn if (LLViewerInventoryItem* inv_item = static_cast(cargo_data)) { *accept = ACCEPT_YES_COPY_SINGLE; - if (drop) - { - mText->setText(currently_set_to(inv_item)); - if (mControl) - mControl->setValue(inv_item->getUUID().asString()); - } + if (drop) setItem(inv_item); } return true; } diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h index 448208965..0da077575 100644 --- a/indra/newview/lldroptarget.h +++ b/indra/newview/lldroptarget.h @@ -69,11 +69,16 @@ public: virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); static LLView* fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory); virtual void initFromXML(LLXMLNodePtr node, LLView* parent); - virtual void setControlName(const std::string& control, LLView* context); + virtual void setControlName(const std::string& control, LLView* context); + virtual void setValue(const LLSD& value); void fillParent(const LLView* parent); void setEntityID(const LLUUID& id) { mEntityID = id;} + protected: + virtual void setItem(const class LLInventoryItem* item); + void setControlValue(const std::string& val); + LLUUID mEntityID; class LLViewBorder* mBorder; LLControlVariable* mControl; From 4a699d6160246c0808e845a1c364b109aa1eaed2 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 22 Sep 2014 03:43:59 -0400 Subject: [PATCH 06/17] Have Drop Targets with settings update when their settings update. --- indra/newview/lldroptarget.cpp | 8 ++++++++ indra/newview/lldroptarget.h | 1 + 2 files changed, 9 insertions(+) diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp index 9ae950db9..1cfb96cd0 100644 --- a/indra/newview/lldroptarget.cpp +++ b/indra/newview/lldroptarget.cpp @@ -37,6 +37,8 @@ #include "lldroptarget.h" +#include + #include "llinventorymodel.h" #include "llstartup.h" #include "lltextbox.h" @@ -135,6 +137,7 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte if (control_name.empty()) // The "empty set" { mControl = NULL; + mConnection.disconnect(); return; // This DropTarget never changes text, it isn't tied to a control } @@ -159,6 +162,10 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte else text = LLTrans::getString("CurrentlySetToAnItemNotOnThisAccount"); } + if (mControl) + mConnection = mControl->getSignal()->connect(boost::bind(&LLView::setValue, this, _2)); + else + mConnection.disconnect(); mText->setText(text); } @@ -186,6 +193,7 @@ void LLDropTarget::setControlValue(const std::string& val) { if (mControl) { + boost::signals2::shared_connection_block block(mConnection); mControl->setValue(val); } } diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h index 0da077575..92786491a 100644 --- a/indra/newview/lldroptarget.h +++ b/indra/newview/lldroptarget.h @@ -82,6 +82,7 @@ protected: LLUUID mEntityID; class LLViewBorder* mBorder; LLControlVariable* mControl; + boost::signals2::scoped_connection mConnection; class LLTextBox* mText; }; From 1d6e21247e4a52819167efcc8f23c3d3adb45ee3 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 22 Sep 2014 20:36:25 -0400 Subject: [PATCH 07/17] Move LLDropTarget rectangle setting into a common function setChildRects --- indra/newview/lldroptarget.cpp | 26 +++++++++++++++----------- indra/newview/lldroptarget.h | 1 + 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp index 1cfb96cd0..6e9b6e277 100644 --- a/indra/newview/lldroptarget.cpp +++ b/indra/newview/lldroptarget.cpp @@ -61,23 +61,23 @@ LLDropTarget::LLDropTarget(const LLDropTarget::Params& p) { setToolTip(std::string(p.tool_tip)); - mText = new LLTextBox("drop_text", p.rect, p.label); + mText = new LLTextBox("drop_text", LLRect(), p.label); addChild(mText); setControlName(p.control_name, NULL); - mText->setOrigin(0, 0); mText->setFollows(FOLLOWS_NONE); mText->setMouseOpaque(false); mText->setHAlign(LLFontGL::HCENTER); mText->setVPad(1); - mBorder = new LLViewBorder("drop_border", p.rect, LLViewBorder::BEVEL_IN); + mBorder = new LLViewBorder("drop_border", LLRect(), LLViewBorder::BEVEL_IN); addChild(mBorder); mBorder->setMouseOpaque(false); - - if (p.fill_parent) fillParent(getParent()); if (!p.border_visible) mBorder->setBorderWidth(0); + + // Now set the rects of the children + p.fill_parent ? fillParent(getParent()) : setChildRects(p.rect); } LLDropTarget::~LLDropTarget() @@ -98,9 +98,7 @@ void LLDropTarget::initFromXML(LLXMLNodePtr node, LLView* parent) LLView::initFromXML(node, parent); const LLRect& rect = getRect(); - const LLRect child_rect(0, rect.getHeight(), rect.getWidth(), 0); - mText->setRect(child_rect); - mBorder->setRect(child_rect); + setChildRects(LLRect(0, rect.getHeight(), rect.getWidth(), 0)); if (node->hasAttribute("name")) // Views can't have names, but drop targets can { @@ -170,6 +168,14 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte mText->setText(text); } +void LLDropTarget::setChildRects(LLRect rect) +{ + mBorder->setRect(rect); + { + mText->setRect(rect); + } +} + void LLDropTarget::fillParent(const LLView* parent) { if (!parent) return; // No parent to fill @@ -182,9 +188,7 @@ void LLDropTarget::fillParent(const LLView* parent) } // The following block enlarges the target, but maintains the desired size for the text and border - const LLRect& rect = getRect(); // Children maintain the old rectangle - mText->setRect(rect); - mBorder->setRect(rect); + setChildRects(getRect()); // Children maintain the old rectangle const LLRect& parent_rect = parent->getRect(); setRect(LLRect(0, parent_rect.getHeight(), parent_rect.getWidth(), 0)); } diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h index 92786491a..37f97030f 100644 --- a/indra/newview/lldroptarget.h +++ b/indra/newview/lldroptarget.h @@ -72,6 +72,7 @@ public: virtual void setControlName(const std::string& control, LLView* context); virtual void setValue(const LLSD& value); + void setChildRects(LLRect rect); void fillParent(const LLView* parent); void setEntityID(const LLUUID& id) { mEntityID = id;} From 6a4c1f6ac6236234682841ecf16707d46957e109 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 22 Sep 2014 21:10:09 -0400 Subject: [PATCH 08/17] Feature Request: Add a clear button to drop targets (except where not needed). --- indra/newview/lldroptarget.cpp | 28 +++++++++++++++++++ indra/newview/lldroptarget.h | 3 ++ indra/newview/llpanelgroupnotices.cpp | 13 +++++++-- .../skins/default/xui/en-us/panel_avatar.xml | 2 +- 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp index 6e9b6e277..1aea26a94 100644 --- a/indra/newview/lldroptarget.cpp +++ b/indra/newview/lldroptarget.cpp @@ -39,6 +39,7 @@ #include +#include "llbutton.h" #include "llinventorymodel.h" #include "llstartup.h" #include "lltextbox.h" @@ -58,6 +59,7 @@ std::string currently_set_to(const LLInventoryItem* item) LLDropTarget::LLDropTarget(const LLDropTarget::Params& p) : LLView(p) +, mReset(NULL) { setToolTip(std::string(p.tool_tip)); @@ -76,6 +78,11 @@ LLDropTarget::LLDropTarget(const LLDropTarget::Params& p) mBorder->setMouseOpaque(false); if (!p.border_visible) mBorder->setBorderWidth(0); + if (p.show_reset) + { + addChild(mReset = new LLButton("reset", LLRect(), "icn_clear_lineeditor.tga", "icn_clear_lineeditor.tga", "", boost::bind(&LLDropTarget::setValue, this, _2))); + } + // Now set the rects of the children p.fill_parent ? fillParent(getParent()) : setChildRects(p.rect); } @@ -98,6 +105,16 @@ void LLDropTarget::initFromXML(LLXMLNodePtr node, LLView* parent) LLView::initFromXML(node, parent); const LLRect& rect = getRect(); + if (node->hasAttribute("show_reset")) + { + bool show; + node->getAttribute_bool("show_reset", show); + if (!show) + { + delete mReset; + mReset = NULL; + } + } setChildRects(LLRect(0, rect.getHeight(), rect.getWidth(), 0)); if (node->hasAttribute("name")) // Views can't have names, but drop targets can @@ -171,6 +188,17 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte void LLDropTarget::setChildRects(LLRect rect) { mBorder->setRect(rect); + if (mReset) + { + // Reset button takes rightmost part of the text area. + S32 height(rect.getHeight()); + rect.mRight -= height; + mText->setRect(rect); + rect.mLeft = rect.mRight; + rect.mRight += height; + mReset->setRect(rect); + } + else { mText->setRect(rect); } diff --git a/indra/newview/lldroptarget.h b/indra/newview/lldroptarget.h index 37f97030f..69d9a6998 100644 --- a/indra/newview/lldroptarget.h +++ b/indra/newview/lldroptarget.h @@ -47,11 +47,13 @@ public: Optional border_visible; // Whether or not to display the border Optional control_name; // Control to change on item drop (Per Account only) Optional label; // Label for the LLTextBox, used when label doesn't dynamically change on drop + Optional show_reset; // Whether or not to show the reset button Optional fill_parent; // Whether or not to fill the direct parent, to have a larger drop target. If true, the next sibling must explicitly define its rect without deltas. Params() : border_visible("border_visible", true) , control_name("control_name", "") , label("label", "") + , show_reset("show_reset", true) , fill_parent("fill_parent", false) { changeDefault(mouse_opaque, false); @@ -85,6 +87,7 @@ protected: LLControlVariable* mControl; boost::signals2::scoped_connection mConnection; class LLTextBox* mText; + class LLButton* mReset; }; #endif // LLDROPTARGET_H diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 40e450dd7..e6bfd0251 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -71,7 +71,14 @@ const S32 NOTICE_DATE_STRING_SIZE = 30; class LLGroupDropTarget : public LLDropTarget { public: - LLGroupDropTarget(const LLDropTarget::Params& p = LLDropTarget::Params()); + struct Params : public LLInitParam::Block + { + Params() + { + changeDefault(show_reset, false); // We have a button for this + } + }; + LLGroupDropTarget(const Params& p = Params()); ~LLGroupDropTarget() {}; // @@ -92,14 +99,14 @@ protected: LLPanelGroupNotices* mGroupNoticesPanel; }; -LLGroupDropTarget::LLGroupDropTarget(const LLDropTarget::Params& p) +LLGroupDropTarget::LLGroupDropTarget(const LLGroupDropTarget::Params& p) : LLDropTarget(p) {} // static LLView* LLGroupDropTarget::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory* factory) { - LLGroupDropTarget* target = new LLGroupDropTarget(); + LLGroupDropTarget* target = new LLGroupDropTarget; target->initFromXML(node, parent); return target; } diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml index 9c59c900e..84be27a55 100644 --- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml +++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml @@ -131,7 +131,7 @@ mouse_opaque="true" name="Give item:" v_pad="0" width="75"> Give item: - + Date: Mon, 22 Sep 2014 21:23:48 -0400 Subject: [PATCH 09/17] Attempt to fix blank region name in region restarting floater. --- indra/newview/llfloaterregionrestarting.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llfloaterregionrestarting.cpp b/indra/newview/llfloaterregionrestarting.cpp index 98406389b..448b85216 100644 --- a/indra/newview/llfloaterregionrestarting.cpp +++ b/indra/newview/llfloaterregionrestarting.cpp @@ -102,7 +102,7 @@ LLFloaterRegionRestarting::LLFloaterRegionRestarting(const LLSD& key) : { //buildFromFile("floater_region_restarting.xml"); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_restarting.xml"); - mName = key["NAME"].asString(); // + mName = key.has("NAME") ? key["NAME"].asString() : gAgent.getRegion()->getName(); // center(); } From 01f2e70f1d37e1e2fea6538eaed93a85059d48ff Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 26 Sep 2014 11:23:06 -0400 Subject: [PATCH 10/17] Fix Issue 1690: Problem in the Italian translation --- .../skins/default/xui/it/floater_animation_bvh_preview.xml | 4 ++-- indra/newview/skins/default/xui/it/floater_image_preview.xml | 2 +- .../newview/skins/default/xui/it/floater_name_description.xml | 4 ++-- indra/newview/skins/default/xui/it/floater_sound_preview.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml index a57a568cd..dfee1157f 100644 --- a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml @@ -1,5 +1,5 @@ - + Nome: @@ -147,7 +147,7 @@ Raccomandiamo file di tipo BVH esportati da Poser 4.