From 67561663da789454c658b5d466e9518790ed9289 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 23 Mar 2011 14:55:28 -0400 Subject: STORM-1101 Using the -login parameter makes some keys and right click menus not work --- doc/contributions.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 560bedd518..35882d1fb2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -156,6 +156,8 @@ Angus Boyd VWR-592 Ann Congrejo CT-193 +Ansariel Hiller + STORM-1101 Ardy Lay VWR-19499 VWR-24917 @@ -413,6 +415,7 @@ Jonathan Yap STORM-990 STORM-1020 STORM-1064 + STORM-1101 Kage Pixel VWR-11 Ken March -- cgit v1.3 From 40e14802e3f5bc78546c8ed38fb1a28e46b0dd7c Mon Sep 17 00:00:00 2001 From: LanceCorrimal Date: Thu, 24 Mar 2011 12:56:15 +0100 Subject: forgot to update contributions.txt --- doc/contributions.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 560bedd518..fac62c7b3b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -434,6 +434,8 @@ Kitty Barnett Kunnis Basiat VWR-82 VWR-102 +Lance Corrimal + VWR-25269 Latif Khalifa VWR-5370 Lisa Lowe -- cgit v1.3 From c7cacf7d67993c1309cae25ef495ad617a7b5bbc Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 25 Mar 2011 17:17:05 -0400 Subject: STORM-1108 Enable Hints menu entry/preference is confusing --- doc/contributions.txt | 1 + .../skins/default/xui/en/panel_preferences_general.xml | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 560bedd518..65ba8b3fc8 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -413,6 +413,7 @@ Jonathan Yap STORM-990 STORM-1020 STORM-1064 + STORM-1108 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 36f8f99178..84cfd31e05 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -307,17 +307,6 @@ tool_tip="Check to use display names in chat, IM, name tags, etc." top_pad="3"/> - - Date: Fri, 25 Mar 2011 17:58:20 -0400 Subject: STORM-1094 Chat preferences > font size should increase size of input text in IM window --- doc/contributions.txt | 1 + indra/llui/lllineeditor.cpp | 5 +++++ indra/llui/lllineeditor.h | 1 + indra/newview/llimfloater.cpp | 3 +++ 4 files changed, 10 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 560bedd518..609bedf5ec 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -413,6 +413,7 @@ Jonathan Yap STORM-990 STORM-1020 STORM-1064 + STORM-1094 Kage Pixel VWR-11 Ken March diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 7e348656a9..900742ed6c 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -2290,3 +2290,8 @@ void LLLineEditor::setContextMenu(LLContextMenu* new_context_menu) else mContextMenuHandle.markDead(); } + +void LLLineEditor::setFont(const LLFontGL* font) +{ + mGLFont = font; +} \ No newline at end of file diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 723423a5b9..7b5fa218f2 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -201,6 +201,7 @@ public: const LLColor4& getTentativeFgColor() const { return mTentativeFgColor.get(); } const LLFontGL* getFont() const { return mGLFont; } + void setFont(const LLFontGL* font); void setIgnoreArrowKeys(BOOL b) { mIgnoreArrowKeys = b; } void setIgnoreTab(BOOL b) { mIgnoreTab = b; } diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index f74ae92a7b..a15d134f87 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -56,6 +56,7 @@ #include "llrootview.h" #include "llspeakers.h" #include "llsidetray.h" +#include "llviewerchat.h" static const S32 RECT_PADDING_NOT_INIT = -1; @@ -891,6 +892,7 @@ void LLIMFloater::updateChatHistoryStyle() void LLIMFloater::processChatHistoryStyleUpdate(const LLSD& newvalue) { + LLFontGL* font = LLViewerChat::getChatFont(); LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("impanel"); for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter) @@ -899,6 +901,7 @@ void LLIMFloater::processChatHistoryStyleUpdate(const LLSD& newvalue) if (floater) { floater->updateChatHistoryStyle(); + floater->mInputEditor->setFont(font); } } -- cgit v1.3 From 3c5dc8b9d3a71d2fdcaee83858c7a02a2813f892 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 5 Apr 2011 12:37:03 -0400 Subject: STORM-1098 : Made change to debug setting description for ShowNetStatus --- doc/contributions.txt | 1 + indra/newview/app_settings/settings.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 71c54e8624..82f7407c5c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -864,6 +864,7 @@ WolfPup Lowenhar STORM-674 STORM-776 STORM-825 + STORM-1098 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dd85c5cb86..490558337b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9557,7 +9557,7 @@ ShowNetStats Comment - Show the Search Bar in the Status Overlay + Show the Status Indicators for the Viewer and Network Usage in the Status Overlay Persist 1 Type -- cgit v1.3 From ab483c6e7c3cbee72dc9cf85c48e5ee48cc57e2c Mon Sep 17 00:00:00 2001 From: Thickbrick Sleaford Date: Sat, 9 Apr 2011 17:10:09 -0400 Subject: STORM-1147: fix skin-tight clothing --- doc/contributions.txt | 1 + indra/newview/llviewertexture.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index c381c5ec79..f95f4ce513 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -793,6 +793,7 @@ Thickbrick Sleaford VWR-13483 VWR-13947 VWR-24420 + STORM-1147 Thraxis Epsilon SVC-371 VWR-383 diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index cc635f71f9..f5fb074992 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1469,7 +1469,7 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/) } setActive() ; - if (!mForceToSaveRawImage) + if (!needsToSaveRawImage()) { mNeedsAux = FALSE; destroyRawImage(); -- cgit v1.3 From 3e7481064ff2f8a7e737ee7c1be32bfc0808c32a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 9 Apr 2011 18:40:35 -0400 Subject: fix contributions.txt whitespace --- doc/contributions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index f95f4ce513..ff982ec61a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -793,7 +793,7 @@ Thickbrick Sleaford VWR-13483 VWR-13947 VWR-24420 - STORM-1147 + STORM-1147 Thraxis Epsilon SVC-371 VWR-383 -- cgit v1.3