From 6583a6d648d2ad71d52a4bc47c0b009a71a3bf41 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Fri, 19 Mar 2010 18:40:59 +0200 Subject: Fixed bug EXT-5927 (Vertical tab labels should be left-aligned). Submitting on behalf of Paul Guslisty. Reviewed by Mike and Q: https://codereview.productengine.com/secondlife/r/70/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/floater_preferences.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index b5a3764e73..49361784ae 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -39,6 +39,7 @@ Date: Fri, 19 Mar 2010 20:49:02 +0200 Subject: Implemented normal task EXT-6379 ([TRUNCATION] [EN XUI REDESIGN] - Receiving Landmarks). - Button order was fixed in changeset dd44dac25177. It was an implemetation of EXT-5906 (Reverse buttons order in the inventory offers). That changeset was included in cumulative diff at https://codereview.productengine.com/secondlife/r/52/ and already made its way into viewer 2-0. - This changeset removes inventory offer button truncation in IM in German locale by increasing default width of IM floater and decreasing distance between buttons. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/77/ --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 2 +- indra/newview/skins/default/xui/en/floater_im_session.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index ac60fe6ba6..ffa24a0c15 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -776,7 +776,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL button->getRect().mBottom)); button->setAutoResize(true); button->autoResize(); - offset += 2 * HPAD + button->getRect().getWidth(); + offset += HPAD + button->getRect().getWidth(); button->setFollowsNone(); } } diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 25016e0673..422e50f035 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -13,7 +13,7 @@ can_minimize="true" can_close="true" visible="false" - width="360" + width="385" can_resize="true" min_width="250" min_height="190"> @@ -22,7 +22,7 @@ default_tab_group="2" follows="all" height="320" - width="360" + width="385" layout="topleft" orientation="horizontal" name="im_panels" -- cgit v1.2.3 From 0f620c10013ccac37986bf8583e4a18c41749a92 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Fri, 19 Mar 2010 20:53:38 +0200 Subject: Fixed bug EXT-5695 (Tabbed IM window loses focus if close any tab by Ctrl+W) Submitting on behalf of Paul Guslisty. Reviewed by Mike: https://codereview.productengine.com/secondlife/r/66/ --HG-- branch : product-engine --- indra/llui/llmultifloater.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra') diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 33d47a3f0e..4af9108329 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -352,6 +352,13 @@ BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask) if (floater && floater->canClose() && floater->isCloseable()) { floater->closeFloater(); + + // EXT-5695 (Tabbed IM window loses focus if close any tabs by Ctrl+W) + // bring back focus on tab container if there are any tab left + if(mTabContainer->getTabCount() > 0) + { + mTabContainer->setFocus(TRUE); + } } return TRUE; } -- cgit v1.2.3 From 25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 Mon Sep 17 00:00:00 2001 From: Soft Linden Date: Fri, 19 Mar 2010 14:22:00 -0700 Subject: DEV-46613 Non-sculpty with sculpty parameters corrupts all similar geometries --- indra/newview/llvovolume.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 86d8204473..cb362d557c 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -962,8 +962,11 @@ void LLVOVolume::updateSculptTexture() if (isSculpted()) { LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); - LLUUID id = sculpt_params->getSculptTexture(); - mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + LLUUID id = sculpt_params->getSculptTexture(); + if (id.notNull()) + { + mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + } } else { -- cgit v1.2.3