From 6e44b8342a37e0fe8c9795c69b1d36a60b30fdcb Mon Sep 17 00:00:00 2001 From: Whirly Date: Tue, 21 Aug 2012 12:30:00 +0100 Subject: VWR-29543 In merchant outbox "create a Marketplace store" link opens wrong article in KB. --- doc/contributions.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index df504e4a8a..3d9a9d08ab 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1228,6 +1228,8 @@ Watty Berkson Westley Schridde Westley Streeter Whimsy Winx +Whirly Fizzle + VWR-29543 Whoops Babii VWR-631 VWR-1640 -- cgit v1.3 From 4cf16ffdfbb166fbb3fcf1d7950ca1a240c94ca1 Mon Sep 17 00:00:00 2001 From: Cinders Date: Wed, 22 May 2013 21:43:32 -0600 Subject: STORM-1888: Hide Spellchecker Settings floater when Preferences floater is closed Bonus: Correct the immediately preceding auto replace comment --- doc/contributions.txt | 1 + indra/newview/llfloaterpreference.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 09c0d01b11..28de94f186 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -301,6 +301,7 @@ Ciaran Laval Cinder Roxley BUG-2326 STORM-1703 + STORM-1888 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index bbf88060c1..fde98aae9a 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -617,9 +617,12 @@ void LLFloaterPreference::cancel() // hide translation settings floater LLFloaterReg::hideInstance("prefs_translation"); - // hide translation settings floater + // hide autoreplace settings floater LLFloaterReg::hideInstance("prefs_autoreplace"); + // hide spellchecker settings folder + LLFloaterReg::hideInstance("prefs_spellchecker"); + // cancel hardware menu LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance("prefs_hardware_settings"); if (hardware_settings) -- cgit v1.3 From f4d2e21f4fdf6953cfa375bd716b1458e3de14e8 Mon Sep 17 00:00:00 2001 From: ZaiLynch Date: Wed, 11 Sep 2013 12:17:22 -0400 Subject: Changing shortcut to toggle preference floater --- doc/contributions.txt | 1 + indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index f33cf36ec2..404103cf91 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1365,6 +1365,7 @@ YongYong Francois Zak Westminster Zai Lynch VWR-19505 + STORM-1902 Zana Kohime Zaren Alexander Zarkonnen Decosta diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index dabfc4eebd..0e95a9d9a9 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -180,7 +180,7 @@ name="Preferences" shortcut="control|P"> Date: Wed, 11 Sep 2013 19:02:36 -0400 Subject: OPEN-189 Add missing header guard --- doc/contributions.txt | 1 + indra/llwindow/llwindowmacosx-objc.h | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 0035d4f597..4e3ce70e0b 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1122,6 +1122,7 @@ Slee Mayo snowy Sidran Sovereign Engineer MAINT-2334 + OPEN-189 SpacedOut Frye VWR-34 VWR-45 diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 32b3bfb078..3b6295fba8 100755 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -25,6 +25,9 @@ * $/LicenseInfo$ */ +#ifndef LL_LLWINDOWMACOSX_OBJC_H +#define LL_LLWINDOWMACOSX_OBJC_H + #include #include @@ -143,3 +146,5 @@ NSWindowRef getMainAppWindow(); GLViewRef getGLView(); unsigned int getModifiers(); + +#endif // LL_LLWINDOWMACOSX_OBJC_H -- cgit v1.3