Commit Graph

212 Commits (a9b52b1f73669c2f97e119a18b299a161f8cf67d)

Author SHA1 Message Date
AlexanderP ProductEngine e298c2ded8 CHUI-487, CHUI-488 FIXED (Enable flashing FUI button behavior and Implement Flashing Conversations panel line item behavior): implemented FUI button flashing; clean up code 2012-11-16 22:36:12 +02:00
AlexanderP ProductEngine 50b69c3f97 CHUI-487, CHUI-488 W.I.P. #3 (Enable flashing FUI button behavior and Implement Flashing Conversations panel line item behavior): implemented conversation's item flashing 2012-11-16 12:38:40 +02:00
Richard Linden cf02780ddf EXP-1513 WIP Underscore ( _ ) fails to show in first chat entry in Local Chat
cleaned up font positioning on buttons
2012-01-27 17:48:08 -08:00
Richard Linden 0c0ff35d19 EXP-1551 FIX Ability to toggle button flashing
added "EnableButtonFlashing" setting
2011-12-13 13:11:55 -08:00
Richard Linden acd047b6be Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-11-28 23:15:03 -08:00
Merov Linden 4afb450225 EXP-1504 : Move the tab opening stuff to lltabcontainer and out of llbutton. Added an xui param to allow drill through tabs. Set that param for build panel only. 2011-11-11 09:31:07 -08:00
Merov Linden 7d78c63c05 EXP-1504 : Allow opening of tab in tab containers when drag and dropping things. Added new param to LLButton to handle this (off by default). Refactor lltabcontainer code a bit while at it. 2011-11-10 17:10:47 -08:00
Richard Linden b6858df0dd LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and LLHandle<Base>
can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
2011-11-08 13:47:08 -08:00
Leslie Linden ae3b5a4907 * Fixed icon opacity on selected and unselected buttons 2011-10-17 15:15:40 -07:00
Richard Nelson a2e32429bb fix for not being able to drag disabled buttons 2011-10-17 13:42:35 -07:00
Leslie Linden 93b6be6288 New icon love for FUI 2011-10-14 14:46:21 -07:00
Richard Nelson 63e4fdfc64 cleaned up floater reg, removed extraneous functions 2011-10-13 10:49:53 -07:00
Richard Nelson 9206226a37 tooltips now only show labels for toolbar buttons when label is hidden or truncated
tooltips are no longer instantaneous once a tooltip is visible
2011-10-12 18:16:59 -07:00
Richard Nelson d5d7e264ad don't highlight toolbar buttons during drag and drop (for real) 2011-10-12 16:51:00 -07:00
Leslie Linden ca9ea84095 * Dimmed overlay color on button image overlays to 0.75*alpha when buttons are
unselected.
2011-10-11 15:54:56 -07:00
Leslie Linden aec61c579a Added 'execute_stop_function' command parameter to handle mouse down/up actions on toolbar buttons 2011-10-11 10:07:19 -07:00
Richard Nelson 6a570a9bdc fixed icons moving when clicking on icon-only toolbars 2011-10-10 17:52:37 -07:00
Richard Nelson adeaf71e33 EXP-1300 WIP Visual feedback for Drag and Drop
removed hover highlighting of buttons when dragging over them
also updated toolbar button art to match spec
2011-10-06 15:19:15 -07:00
Leslie Linden 93e3c8e4a5 EXP-1280 FIX -- Minimized floaters associated with toolbar buttons should change the state of their parent button
* Toolbar buttons now display green when its corresponding floater is open or
  minimized.
* Made changes to buttons so flash time and rate is configurable
* Removed unused "highlight_color" attribute from LLButton
* Implemented "isVisible" function for toolbar button floaters.  It returns true
  when the floater is visible or minimized.
* Toolbar floater unminimize now also puts focus to the floater
* All commands now specify their "is_running_function" for toolbar button state
* ButtonFlashCount and ButtonFlashRate have been moved to button.xml settings
  and are now configurable on the button.  Toolbar buttons are set to never
  flash and this functionality is used to show which buttons have windows open.
* All toybox buttons show hover glow even when disabled

Reviewed by Richard.
2011-10-05 16:28:40 -07:00
Richard Linden 78eb989e50 EXP-1258 FIX toggle buttons between icons and icons+text modes
fixed button layout for icon only buttons
2011-09-27 19:22:09 -07:00
Richard Linden 68d5141fb3 EXP-1258 WIP toggle buttons between icons and icons+text modes
fixed button layout for icon+text
layout stack now uses floating point precision to avoid clamping panels to 0
2011-09-27 19:06:02 -07:00
Richard Linden 8912a9bef6 EXP-1258 WIP toggle buttons between icons and icons+text modes
better button sizing
also disabled context menu for non-toolbar region
2011-09-27 15:53:38 -07:00
Richard Nelson cc56958452 initial support for switching between icons only and icons + text 2011-09-26 19:48:27 -07:00
Richard Linden 64f30a302d EXP-1228 FIX Create toolbar widget class that displays list of buttons horizontally or vertically
buttons are now centered and sized according to content
created floater_test_toolbar.xml to test
2011-09-20 16:37:21 -07:00
Richard Linden 24db50a37f fix for held down delay not parsing from xui 2011-09-08 15:07:11 -07:00
Richard Linden b183b6f141 EXP-1196 FIX Fix param block template ordering
changed ordering of template loading relative to constructor setting of params
moved a lot of constructor-set params to template files
reviewed by Leslie
2011-09-06 14:45:11 -07:00
Leyla Farazha 64f978dc81 EXP-891
Right click on Inbox or Outbox toggles up down arrow but has no action
2011-06-16 16:39:30 -07:00
Leslie Linden def85f2778 EXP-865 FIX -- Modify LLBadge to allow it to hang off of non-buttons
LLBadgeOwner now only depends on LLView instead of LLUICtrl
Sidebar Tab Buttons now can support badges

Reviewed by Leyla
2011-06-09 12:12:28 -07:00
Leslie Linden de78d17e91 Merge from viewer-experience 2011-06-08 13:41:40 -07:00
Leslie Linden 888b39c283 EXP-865 PROGRESS -- Modify LLBadge to allow it to hang off of non-buttons
Moved LLBadge use from LLButton into a separate LLBadgeOwner class.
LLButton now derives from LLBadgeOwner which handles the bulk of the
badge management.
2011-06-08 13:14:15 -07:00
Leslie Linden 1aed984928 EXP-865 PROGRESS -- Modify LLBadge to allow it to hang off of non-buttons
Added the following for increased LLBadge functionality:
 * Panels now choose whether or not they accept buttons as children, which they
   do by default.
 * UI controls now shuffle controls with "requests_front" to the front of their
   children list at postBuild time.
 * Badges are set to "requests_front" by default
 * Badges now accept border image and color attributes

 Reviewed by Callum
2011-06-07 13:57:19 -07:00
Leslie Linden 406195e4f2 Added badges version 0.1 to buttons.
Reviewed by Richard
2011-05-24 09:38:49 -07:00
Paul Guslisty 85c75c9ce3 STORM-689 FIXED "Back" but is opaque in all of the undocked side panels
- Added parameter to the button that defines which transparency value should be used: value of drawing context or transparency value of a its parent (in our case this parent is floater)
2010-11-29 20:04:26 +02:00
Richard Linden d0bc4fc5e6 DEV-53015 FIX Volume slider disappears when sliding on panel_prim_media_controls.xml 2010-09-09 19:07:07 -07:00
Merov Linden 2ffd7aad9f Rolling back 28f52b3d2e3d : optimizations in button rendering 2010-10-06 20:34:38 -07:00
Merov Linden 862a951880 Backed out changeset 28f52b3d2e3d (optimizations in button rendering). 2010-10-06 20:22:53 -07:00
Vadim Savchuk baeded61a7 STORM-101 FIXED Moved floater settings (rect, visibility, docked state) to account-specific XML file.
The settings are now stored to settings_per_account.xml.
This change affects all floaters having save_rect/save_visibility/save_dock_state params set to "true",
not just detached sidebar tabs as the ticket requests.
2010-09-13 20:06:48 +03:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson cba6943b27 optimizations in button rendering 2010-07-30 17:41:41 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Richard Linden 1f79bee86e EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit

reviewed by Vir
2010-07-09 14:26:56 -07:00
Leyla Farazha 11ec720a06 adding eol 2010-06-22 16:55:08 -07:00
Leyla Farazha 25de07a379 EXT-7980 Double-clicking no longer selects contents of number fields
reviewed by Richard
2010-06-22 16:14:22 -07:00
Andrew Dyukov 1e090dafa6 EXT-7087 ADDITIONAL FIX Style changes regarding image_flash attribute
Removed default "FlashIconAbsent" value of image_flash button attribute. Changed check for presence of thic icon in code accordingly.

--HG--
branch : product-engine
2010-06-01 16:42:31 +03:00
Andrew Dyukov 66ddb437f1 EXT-7087 FIXED Added flashing icons for im tabs and hooked them up in code
Added new attribute image_flash to button.xml which sets an image used for button icon when button is flashing.
Pointer to this image is stored in member mImageFlash from LLButton and is used in LLButton::draw(). There are two
ways an image can flash now - by making changes in color according to flash_color attribute or by changing icon from
current to the one specified in image_flash. Second way is used only if the name of flash icon is different from
"FlashIconAbsent" which is there by default. First way is used otherwise. Used new selfmade orange icons for
flashing tabs.

--HG--
branch : product-engine
2010-05-31 22:30:35 +03:00
Dmitry Zaporozhan edd0e47d5c Fixed EXT-6597(normal) - Clicking the maturity rating icons in the navbar need tooltips and clicking should link to a help article.
Added LLButton::setImagePressed(), there was no way to set pressed image at run-time. The only place where pressed image is initialized was LLButton constructor.

Replaced Maturity icon with button to simplify handling clicks. Icon does not provide click callback and we would need to handle mouse up/down events and track clicked widget.

Added icon for Moderate regions.

Did not find maturity help topic, added a "TODO".

Reviewed by Sergey Litovchuk - https://codereview.productengine.com/secondlife/r/243/

--HG--
branch : product-engine
2010-04-22 12:40:36 +03:00
Richard Linden 39ef9e9dd6 EXT-6492 - button halign=center doesn't take into account left and right pad 2010-04-01 14:56:53 -07:00
Paul Guslisty acc0a2962b EXT - 3232 Refactoring: deleted unnecessary image_left_padding, image_right_padding members from button.h and button.xml and their the only place usage in LLTabContainer::reshapeTuple . Now image overlay placement adjustible via: mLeftHPad, mRightHPad, mImageOverlayBottomPad, mImageOverlayTopPad, mImgOverlayLabelSpace
--HG--
branch : product-engine
2010-02-08 19:09:23 +02:00
Paul Guslisty 7199c9cc1b EXT-3232 Refactoring: Improved the way of horizontal alignment of button's image overlay. Now mLeftHPad/mRightHPad is used instead of mImageOverlayLeftPad and mImageOverlayRightPad. Also mImgOverlayLabelSpace/imgoverlay_label_space members was added to button.(h/xml) to define space between image overlay and button's label
--HG--
branch : product-engine
2010-02-08 18:05:48 +02:00
Paul Guslisty 77b5a39cc1 Fixed normal bug EXT - 3232 (Make button image overlay placement adjustable via xml)
--HG--
branch : product-engine
2010-02-05 17:34:50 +02:00
Paul Guslisty 8ea2c7a373 Implemeted normal Sub-Task EXT - 2753 (Implement Avatar icons on IM multifloater tabs)
--HG--
branch : product-engine
2010-01-27 14:16:37 +02:00
Paul Guslisty 0fd17c8d2d Implemeted normal Sub-task EXT - 2753 (Implement Avatar icons on IM multifloater tabs). Some code needs improvements(refactoring, optimization)
--HG--
branch : product-engine
2010-01-21 21:11:59 +02:00
James Cook fce0d168ae EXT-3233 Button label vertical placement cannot be adjusted via xml
Added bottom_pad attribute to widgets/button.xml and removed old
LLBUTTON_VPAD global and ButtonVPad saved setting.
Reviewed with Richard.
2009-12-11 13:48:35 -08:00
James Cook 7d3b3cc474 Linker optimization - use "extern template" for commonly regenerated templates
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
James Cook b50ba67bd8 Revert extern template link optimization until I can build/test on PC 2009-11-29 10:19:17 -08:00
James Cook 928b7cba3e Linker optimization, use extern template for LLView::getChild<> 2009-11-25 22:00:15 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
richard 7fd1488c62 convert signals to allocate on demand in order to speed up widget construction
reviewed by James
2009-11-23 11:42:32 -08:00
James Cook d5efbfcd28 Convert mForcePressedState to bool from BOOL 2009-11-16 12:36:35 -08:00
richard 0ee426016a added newline at end of llbutton.cpp
removed non-localized, invisible labels from scrollbar and tab container arrows
EXT-1626 - there is text overlaping in group info mini inspector

reviewed by James
2009-11-04 10:37:13 -08:00
richard 995c18b1c7 removed picture_style from LLButton::Params and allow empty labels 2009-11-02 19:28:24 -08:00
angela 07749af387 EXT-1954 Implement Inspector Info i rollover icon 2009-10-29 16:28:04 +08:00
Steven Bennetts b43771cad5 Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
2009-10-23 17:20:45 +00:00
Steven Bennetts 20e56a6925 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
2009-10-13 16:25:48 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Adam Moss feabeb4965 DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Steven Bennetts 79653dfed4 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
2009-08-12 01:12:27 +00:00
Steven Bennetts caa367e5d4 svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261  I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897  Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
2009-08-11 06:37:35 +00:00
James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
Nat Goodspeed fcaa1ad46f QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
Steven Bennetts ade6bbb06c merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3 2009-06-21 17:16:27 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
James Cook 2a44e81675 QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge 2008-11-19 23:26:29 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Josh Bell 810a0b3dce svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --> release
Effectively:
svn merge -r 87048:88773 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
* Plus some gcc4.x fixes

In detail:

* Bump version numbers to 1.22.0 Server
* Updated files for enabled conductor.
* Added tarball pulling during deploy for central servers.
* DEV-15160 Logins not remembering start location on beta grid
* DEV-15167 Random failure with set-classified-stats
* DEV-15193 Viewer Passing Through Unsanitized Strings to DB when creating classifieds.
* Add --location to the curl invocation in fetch_agni_ws_snapshot
* QAR-609 Some Havok4 bug fixes
* QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
* DEV-14704 1.21.1.86182 revealing hidden groups in profile
* DEV-14641 Change automated Subject Line messages for IM-to-Email to avoid SPAM association
* DEV-15387 Write unit test for LLStringFn::strip_invalid_xml().
* Changed getpass.getuser() to os.getuid() as getuser() was returning the saved-UID of the process (root user, which kic
ks off parabuild as parabuild u
ser). We want os.getuid() as it correctly returns the parabuild user's uid. / Stupid mistake using os.getuid().. .fixed
by using the pwd module to return the unix username given the userid from os.getuid()
* QAR-623 More single ref attachment awesomeness testing
* Committed temporary fix for running dwell and query-cache on deneb.lindenlab.com, since it's in the DFW colo with the
current asset cluster.
* DEV-15783 Groups not shown in search wont appear in your profile while using webservice
* QAR-642 Even more single ref attachment awesomeness testing

From Branch_1-21-Server (which didn't go directly into release)
* addinng the phputf8 library found from http://phputf8.sourceforge.net/ and liscensed LGPL. For DEV-15202
* Checking in a fix for settle balance portion proc - the event query was moved.
* fix for DEV-15202 - replace non-utf8 with REPLACEMENT CHAR. See jira for more info.
* Checking return value from /proc/vault/charge, must get back a string.
* removed code used for the browser hud AB test.
* Changed TTL from stupid default of 1234 to 5
* DEV-15788  Fixing crashloganalyzer.py cleanup of unparseable crash reports.
* DEV-15737  offline scripted IMs not working inprocess_im_using_ws

Merge conflict resolutions/fixes include:
* Addition of indra/test/llstring_tut.cpp to indra/test/test.vcproj migrated to CMakeLists.txt
* Changes to BuildParams, scripts/automated_build_scripts/* reviewed w/ cg
* Changes to deploy scripts (scripts/farm, install_indra.py, farm_deploy) based on the 1.22 changes except for mkpersist
dir addition (retained from release)
* Changes to scripts/crash_report/crashloganalyzer.py retained from 1.22, per Mani
* scripts/generate_indra_xml.py, etc/services-station.dtd, indra/newsim/llagentinfo.cpp analyzed carefully by josh
* indra/llcommon/llstring.h required fix for client build ("" --> std::basic_string<T>()) in LLStringBase<T> initializer
* indra/llphysics/abstract/llphysicsshape.h #include syntax changed from <llmath/llvolume.h> to "llvolume.h"

Psst, don't tell anyone, but the dataserver-is-deprecated
2008-06-06 22:52:02 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Steven Bennetts e3b97ac65b merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
2008-03-20 21:41:26 +00:00
Steven Bennetts 672a76d0ea reverting premature commit at 82410. 2008-03-15 01:18:27 +00:00
Mark Palange 04611efae8 [NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +00:00
Josh Bell a10f963900 svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
2008-03-04 16:59:57 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Steven Bennetts 903292ba67 merge -r 78989:80279 Branch_1-19-0-Viewer-> release
Changes from 1.19.0.2 and 1.19.0.3

DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031    	Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066    	Checking to select a role does not enable the apply button
DEV-8809    	stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans.  svn merge -r77376:77377 sl-parcelmedia-3.  OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 	Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 	Alt and left/right arrow keys dont move you between tabs
DEV-10093 	Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 	Redocking the Contact list causes the communicate ui to get ugly
DEV-8131  	 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 	Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)
2008-02-19 23:12:34 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
Jon Wolk 7dd08303a3 svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134 2007-12-19 00:56:59 +00:00
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
Josh Bell 7afa8058aa svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
2007-11-01 22:02:35 +00:00
Christian Goetze 5ec8bbbe22 svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
Monroe Williams 7138fb673a Merge down from Branch_1-18-1:
svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
Don Kjer 9746cf5310 EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392

ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-26 01:22:23 +00:00
Aaron Brashears f118e7c80b result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
Don Kjer 70aaa3e444 svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-04 21:57:06 +00:00
Josh Bell 0277259455 svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-11 17:54:18 +00:00
Josh Bell ea8fb7238e svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00
Mark Lentczner d0d4670f49 merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
2007-02-06 00:57:33 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00