From e703ee3152876a19f59cb88493a70b4d54fc1c35 Mon Sep 17 00:00:00 2001 From: Beeks Date: Tue, 14 Sep 2010 22:38:02 -0400 Subject: [PATCH] Fix for tabbing order on Friends list, new features were confusing or changing the expected usage by regular users Cleaned up the source file as well. Signed-off-by: Beeks --- indra/newview/ascentfloatercontactgroups.cpp | 128 +----------------- .../xui/en-us/floater_contact_groups.xml | 1 + .../skins/default/xui/en-us/panel_friends.xml | 106 ++++++++------- 3 files changed, 56 insertions(+), 179 deletions(-) diff --git a/indra/newview/ascentfloatercontactgroups.cpp b/indra/newview/ascentfloatercontactgroups.cpp index e41b052c3..b460a6368 100644 --- a/indra/newview/ascentfloatercontactgroups.cpp +++ b/indra/newview/ascentfloatercontactgroups.cpp @@ -11,29 +11,6 @@ */ -/* - __---__ - _- _--______ - __--( / \ )XXXXXXXXXXXXX_ - --XXX( O O )XXXXXXXXXXXXXXX- - /XXX( U ) XXXXXXX\ - /XXXXX( )--_ XXXXXXXXXXX\ - /XXXXX/ ( O ) XXXXXX \XXXXX\ - XXXXX/ / XXXXXX \__ \XXXXX---- - XXXXXX__/ XXXXXX \__---- - ----___ XXX__/ XXXXXX \__ --- - -- --__/ ___/\ XXXXXX / ___---= - -_ ___/ XXXXXX '--- XXXXXX - --\/XXX\ XXXXXX /XXXXX - \XXXXXXXXX /XXXXX/ - \XXXXXX _/XXXXX/ - \XXXXX--__/ __-- XXXX/ - --XXXXXXX--------------- XXXXX-- - \XXXXXXXXXXXXXXXXXXXXXXXX- - --XXXXXXXXXXXXXXXXXX- - CODE GHOSTS OFFICIALLY BUSTED -*/ - #include "llviewerprecompiledheaders.h" #include "ascentfloatercontactgroups.h" @@ -293,107 +270,4 @@ void ASFloaterContactGroups::populateGroupList() LLChat msg("Null Scroller"); LLFloaterChat::addChat(msg); } -} - -/* -* BATGIRL -* -* -* .//////..... I: . -* .////....///////........IA...... // -* XYt///////./.....////......$$$$$$$$$$$./I$ -* .Y/XX//?//./....////////......$$$$$$$$$$$$$$/ -* XYXXXXXXX///......//////.....$$$$$$$$$$$$$$$. -* XXXXXXXX////XX/....//.///./..$$$$$$$$$$$$$$$.... -* ///////......////X...//.//./$$$$$$$$$$$$$$$...../.. -* ////..////////..../X/X//////$$$-.$$$$$$$$$$./...///.. -* ///////////////....//X/XX///$$ .'$$.$-..$$$.///..//?.... -* ////////////X/////////XX/XX/$I .;;. .$$.//xX/XXXXX///////. .$$$$$$/ -* /XX/XXX//////XXXXX////XXX/X/$$ .::- ..$//XXX/////////////$$$$$$$/ -* ////XXX//XXXXXX//////XXXXX//$$ --- $/////X///XXXXXXXA$$$$$$../... -* /////XX/XX$$$$$X$$$$$$$////$$$$. .$$$$$X//$$$$$$X/X/$$$$(////..///. -* ///XXXXX$$$$$$$$$$$$$X$$///$$$$$$$$$$$$$$$XX$$$$$X//////$$$$$$//////// -* ?$$$$$$$$$$$$$:''':.::'V$$$$$'$$$$$$XXX$$$$X''''$$XXXX/$A$$$I,X//XX///// -* $$$$$$$$$.... .. .:.::::V$$$$$$$$$$::.. .$$$:X//VA$H/X/XX//// -* $$$$$$$$::. . . ..:I::. . .:..I:. ..$$$$XHAMMHIHA//XX/ -* $$$$$$$:..:... ..I:. .::. . .$$$$VMMMMMWV'I:.XX -* $$$$$$$:. .:$$$$$$$$. .I:. .:.. .$$$VMMMMV/.//XXXX -* $$$$$$::. $$4$$$$. now .I. .:. with ..:$;.. .$$VMMMA/XXXXX -* $$$$$$A:. /$$$$$$:dynamic.I.. .:..:breast .:$$$$:. .AMMMM$XXXX// -* $$$$$IMMAAM$$$$$$:: .I.. ... .:$$$$$$$:. .AMMMMM'$$XX$ -* $$$$$IMMHMV$$$$$$$. phys.:I...ics .$$$$$$$$$$:. ..VMMMMMX$$$:X -* $$$$$:MHHM$$$$$$$$$:.. ...:II... . ... :$$$$$$$$$$$$$:.:VMMMM'$$$$$ -* $$$$$HMHMV$$$$$$$$$$;....:.:II:......- .$$$$$$$$$$$$$$$$:.:VM'$$$$$$ -* $$$$4HMHMV$$$$$$$$$$;....:.:II:......- .$$$$$$$$$$$$$$$$:.:VM'A$$$$$ -* $$$$$HMHM4$$$$$$$$$$$$;. .:::.::.. .:$$$$$$$$$$$$$$$$$$$$$$$V$$$$$$ -* $$$$$MHHV$$$$$$$$$$$$:. .:. .:$MV'.VMM$$$$$$$$$$$$$$$$$$$$$ -* $$$$$MMM$$MM$$$MM$$$$... .. :$$. .VM$$$$$$MMMM$M$$$$$$$$ -* $$$$$MMHA$$MMMM$M4$V .. ... .:$: .VM$$$$MMMMV..VM$$M$M$ -* $$$$$MMLMA$MMMMMM$$' ... ... :$$. .H$$$$MV' .VMM$M$$ -* $$$$$MHAHH$V. .V$$. ... ... .:$$ V$$$MV VMM$MM -* $$$$$MMMMHA V$ :. . . ..'V. V$$V VMM$$ -* $$$$$$VHMHA $ .:.. .: . $. .$$ VMM$ -* $$$$$$VAA . .::.. .; :.. . $$ VMM$$ -* $$$$$$$$$$ .::. . .. . . V. VM -* $$$$$M$$$$. ..:.:... . . .. I .V -* $$$$$$M$$$$ . .:. :... . .. .. . . -* $$$$$$$$$$$. . . .:.. . .::. . -* $$$V''$$M$$$ : . -* $$$ .VM$. .:. $$$$ . -* $$$ $$$ :. $$$$$$$$$ -* $$$$ $$ .. $$$$$$$ . -* $$$$$ IV .. $$$$$ -* $$$$$$. $ .. .$$$. . -* M$$$$$$$ . ... .: :... -* MM$$$$$$$ ... .. :... . -* .V$MM$$$4$ ... .: .::.. -* .V$MM$$$$ .. .$.:... . -* .V$MM$$$$ ... :$$$::.. . -* V$:V$:$$ ... .$$$::.. . -* $ $$ ;$ .. .$$$$:.... . -* . V$ .$ ... .$$$$.:.. -* V$ $ .. .$$$$$:.. . . -* V$ . .. . $$$::.. . -* V$ ... . $$$;:. -* $I .. . $$;:.. . -* $. ... .. $;;.. . -* $ ... ... $;:.. .. -* $ ... .. $$.::$ -* I. ... .. $$$$ -* . ... ... -* .:... .:. -* ::.. ... -* .:.. .:. -* :.. .::. -* :. .:.. -* :. .$$$;. -* :. $$$$$$. -* :$$$$$$$$$ -* $4$$$$$$$$ -* $$$$$$$$$$ -* ;$$$$$M$$; -* $$$$$IM$$$ -* V$$$M$$$$$ -* ;$$$$M$$$; -* $$$M$$$$; -* $$$$$$$$ -* ;$$$$$$$ -* $$$$$$$ -* $$$$$$$ -* $$$$$$$ -* ;$$$$$$ -* $$$$$$ -* $$$$$$. -* $$$$$$$$ -* $$$$$$$: -* $$$$$$$: -* :$$$$$$: -* $$$$$$$: -* $$$$$$$$ -* $$$$$$$$ -* $$$$$$ -* $$$$ -* $$ -* -* -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en-us/floater_contact_groups.xml b/indra/newview/skins/default/xui/en-us/floater_contact_groups.xml index 4df58d00a..e5a2d4420 100644 --- a/indra/newview/skins/default/xui/en-us/floater_contact_groups.xml +++ b/indra/newview/skins/default/xui/en-us/floater_contact_groups.xml @@ -7,6 +7,7 @@ Multiple friends... - - Contact Group: - - - Contact Search: - - - + follows="left|top|bottom|right" left="10" multi_select="true" + name="friend_list" right="-100" search_column="1" + tool_tip="Hold shift or control while clicking to select multiple friends" + top="-60"> + tool_tip="Online status" width="20" /> + tool_tip="Friend can see when you're online" width="20" /> + tool_tip="Friend can locate you on the map" width="20" /> + tool_tip="Friend can edit, delete or take objects" width="20" /> + tool_tip="You can see when they are online (only updates on login)" width="20" /> + tool_tip="You can locate them on the map" width="20" /> + tool_tip="You can edit this friend's objects" width="20" /> + + Contact Group: + + + Contact Search: + + + - +