Commit Graph

149 Commits (ea3b2b42e1e192ca708c4f062f526e7ea588ef89)

Author SHA1 Message Date
Nicky 9c7ab535d4 Adjust for changes in LLUI after merge, 2014-06-10 11:17:28 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
simon 4acc2dc273 Merge viewer-release 2014-02-10 15:42:25 -08:00
Oz Linden 52ec6f9af0 remove excessively complex fixes for MAINT-2914 and MAINT-3142 2013-11-26 15:09:55 -05:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
maksymsproductengine cfcf6d9bd4 MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost". 2013-09-26 00:34:00 +03:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
dmitrykproductengine f8e5ae8006 MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797) 2013-10-04 14:04:31 +03:00
simon 90d1c5b367 Merge downstream code for CHUIStorm 2013-08-26 15:45:09 -07:00
maksymsproductengine 01a7002228 MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost". 2013-09-26 00:34:00 +03:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
dmitry 48f702029f MAINT-2914 FIXED Mousing over UI elements does not make them light up 2013-08-02 18:00:08 +03:00
Mnikolenko ProductEngine 0cf9597bd5 CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread IMs when the conversation floater is minimized. 2013-06-11 15:30:31 +03:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
prep@lindenlab.com 0f24668b0a Merged in Chui beta6+ fixes 2013-03-29 10:37:58 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Gilbert Gonzales abf1bf79f2 CHUI-881 ([CHUIBUG]Viewer crashes when user drag and drop the participant from the people floater to the one of the tool bars): Problem was that the item dragged from the people list was not of type inventoryitem. Instead of casting to an inventoryitem and checking if the item being dragged is a widgit, instead look at the cargo type (which also specifies that the dragged item is a widgit but doesn't need to typecast). 2013-03-21 16:16:54 -07:00
Richard Linden 7b4d27ecbc SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
collapsed Orientation enums to all use LLView::EOrientation
added ability to display stat bar horizontally
2013-03-14 19:36:50 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
AlexanderP ProductEngine f944608ab9 CHUI-707: "Chat" toolbar button stop flashing after setting toolbar buttons view to "Icons only": save/restore flashing states 2013-02-06 20:00:43 +02:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master c61db3d380 Merge LGPL tip 2013-06-26 12:59:37 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kitty Barnett a9ffc0120a Merged with default tip (Revision 13149a524874)
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
Kadah_Coba 661f9aacd7 Added option for edge snapping based on the legacy method of toolbars changing the edge offsets
Includes one hack for chatbar being unable to return its own height correctly
2013-06-05 19:02:09 -07:00
Kitty Barnett 4101c43f5f Merged with viewer-sunshine tip (Revision 87a6fc812214)
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
Kitty Barnett e1b955226d Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
maksymsproductengine edeeed9541 CHUI-531 FIXED Poor fps in CHUI viewer 2012-11-21 01:41:49 +02:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Dave Parks 7aca8ad6b8 MAINT-1534 Fix for calls to find widgets getting out of hand. 2012-09-11 15:55:36 -05:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Kitty Barnett ddc6afdd81 Merged with default tip (Revision f8183e357a6f)
--HG--
branch : RLVa
2012-04-21 22:29:42 +02:00
Richard Linden d56be1f175 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
Kitty Barnett 6e0666adc3 Merged with RLVa-1.4.5 tip 2012-03-10 21:38:23 +01:00
ziree 2c5e50f59e Added optional control checkbox to push buttons, made AO command button use it to switch AO on and off. 2012-02-21 00:37:58 +01:00
ziree 1298ee9a9d Added top, bottom, center, left and right alignment options to toolbars. 2012-02-20 16:59:12 +01:00
ziree bdecd7aa44 Made command list able to use control_name buttons. 2012-02-20 15:10:45 +01:00
ziree 7488446f12 Backed out changeset 2d69be4d26b9
Clashed with Ansariel's changes
2012-02-20 14:53:19 +01:00