summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-06-11mergin mergin mergin.Palmer
2010-06-11mergePalmer
2010-06-11MergeDessie Linden
2010-06-11Backed out changeset useVBO fix, 12f94ed4e02b, "LLVertexBuffer only supposed ↵Palmer
to use sEnableVBOs at moment vert buff is created" for EXT-7835. Will fix soon.
2010-06-11Changed version to 2.1.0.0Dessie Linden
2010-06-11Automated merge with ssh://hg.lindenlab.com/dessie/viewer-releaseLynx Linden
2010-06-11automated mergeLoren Shih
2010-06-11EXT-7824 FIXED Assert when changing folder type to "default"Loren Shih
Not a serious assert error, but added "default" folder type to get rid of it.
2010-06-10Moved updater and crash_logger build dependencies from pacakge to sl-bin for macpalange
2010-06-10Merging latest dessie/viewer-release into brad/viewer-publicLynx Linden
2010-06-10automated mergeLoren Shih
2010-06-10EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Changed folder icon logic to use LLViewerFolderType (as it should always been doing).
2010-06-10merge from PE's viewer-releaseTofu Linden
2010-06-10EXT-7608 FIXED TeleportHistory and Landmarks panels now sets "enable" for ↵Vladimir Pchelko
"Map" bottom according to Design Spec. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/546/ --HG-- branch : product-engine
2010-06-10EXT-7671 FIXED assigned appropriate callback for second Gear menu (panel ↵Igor Borovkov
outfit edit) Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/542/ --HG-- branch : product-engine
2010-06-10EXT-6685 FIXED Disabled showing nearby chat toasts on receiving debug ↵Alexei Arabadji
message with enabled setting 'show script errors in separate window'. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/541 --HG-- branch : product-engine
2010-06-09mergeAndrew A. de Laix
2010-06-09Fix EXT-7432: if SL exits before SLVoice connection handshake completes, ↵Andrew A. de Laix
just kill the SLVoice process. Verified this is OK on windows.
2010-06-09EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Took out explicit _Link icons and replaced with overlay. Removed links overlays from non-main-inventory-floater panels.
2010-06-09Automated merge with ssh://hg.lindenlab.com/dessie/viewer-releaseMark Palange (Mani)
2010-06-09Put range check around iterator assignmentMark Palange (Mani)
2010-06-09Automated merge with ssh://hg.lindenlab.com/dessie/viewer-releaseMark Palange (Mani)
2010-06-09mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-09EXT-7605 FIX fix consequences. to play safe reduce ctrl sizeYuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/540/ --HG-- branch : product-engine
2010-06-09EXT-7616 FIXED "Rename" outfit context menu item is now called "Rename Outfit".Vadim Savchuk
Trivial change, not reviewed. --HG-- branch : product-engine
2010-06-09EXT-6726 ADDITIONAL FIX Minor code cleanup.Vadim Savchuk
Removed duplicated code from LLFolderBridge::isItemRenameable(). Requested by Richard at https://codereview.productengine.com/secondlife/r/466/ --HG-- branch : product-engine
2010-06-09EXT-7577 FIXED added filtering add wearables panel (list and folder views) ↵Igor Borovkov
according to the current user's selection - added filtering add wearables panel (list and folder views) according to the current user's selection (rules for showing a particular view and setting a particular filtering are specified in the table at https://jira.secondlife.com/browse/EXT-7577) - minor refactoring Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/534/ --HG-- branch : product-engine
2010-06-09EXT-6710 FIXED Updated inventory items sharing behavior according to ↵Alexei Arabadji
comments: "Andrey ProductEngine added a comment - 02/Jun/10 03:21 AM" and "Grumpity ProductEngine added a comment - 02/Jun/10 03:25 AM" of EXT-6710 issue. 1 Reused 'ShareNotification' with updated message. 2 Made allert message box scrollable(done by Yuri Chebotarev). 3 Updated word words_separator in strings.xml. 4 Made friends list tab of avatar picker be opened on 'share with avatar' action. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/525/ --HG-- branch : product-engine
2010-06-09EXT-7611 FIXED Enabled the "Create new [TYPE]" context menu item for ↵Vadim Savchuk
non-worn items in the outfit editor. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/535/ --HG-- branch : product-engine
2010-06-09mergeVadim Savchuk
--HG-- branch : product-engine
2010-06-09mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-09EXT-7534 FIX add toast wrapping pannel paddingYuri Chebotarev
reviewed by Alexei Arabadji at https://codereview.productengine.com/secondlife/r/536/ --HG-- branch : product-engine
2010-06-09mergeVladimir Pchelko
--HG-- branch : product-engine
2010-06-09EXT-7640 FIXED Added new option to viewer avatar height that allows users to ↵Vladimir Pchelko
see their height in either feet or meters Feature details: Added new property HeightUnits. Implemented logic that build TextBox label correctly according to document https://docs.google.com/a/productengine.com/Doc?docid=0AXxJWUubGIsoZGhqZDcya3JfMWdybXNwdGd0&hl=en -> 'Mockup - Edit Shape' Reviewed by Vadim Savchuk, Neal Orman, Mike Antipov at https://codereview.productengine.com/secondlife/r/531/ --HG-- branch : product-engine
2010-06-09mergeYuri Chebotarev
--HG-- branch : product-engine
2010-06-09EXT-7328 FIX If accordion tab has "fit_to_panel" flag on its height ↵Yuri Chebotarev
shouldn't be changed while arranging accordion tabs even if its the only tab in ctrl. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/533/ --HG-- branch : product-engine
2010-06-09merge from PE's viewer-releaseTofu Linden
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with ↵Andrew Dyukov
already existing account settings - The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same. - To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message. - Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse"). Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run. Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/ --HG-- branch : product-engine
2010-06-08EXT-5629 FIXED Made sensitivity of +/- zoom buttons from camera floater ↵Andrew Dyukov
consistent with viewer 1.23 - Changed actions happening when minus or plus are held- now onSliderValueChanged() is not used for zoom via buttons. Zooming in and out now happens as it did in 1.23 in LLJoystickCameraZoom::onHeldDown(), but only "Zoom in slow" and Zoom out slow" were borrowed from there, because fast versions are not needed- they do not happen in 1.23. - Removed LLJoystickCameraZoom class, because it's not used anywhere. If need for it ever rises, it can be easily restored. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/530/ --HG-- branch : product-engine
2010-06-08EXT-7604 FIXED Button overlay image and size were changed.Vladimir Pchelko
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/518/ --HG-- branch : product-engine
2010-06-08EXT-6933 FIXED According to behavior in viewer-1.2: minimal price value was ↵Vladimir Pchelko
changed to 0. Problem description: Minimal price value was 1. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/510/ --HG-- branch : product-engine
2010-06-08Fix for false positive in error checking symbol file generation on windows ↵brad kittenbrink
(MissingModuleError).
2010-06-08mergeVladimir Pchelko
--HG-- branch : product-engine
2010-06-08EXT-6934 FIXED method LLInventoryObject::rename does not change Name, if ↵Vladimir Pchelko
string is empty after correction. Problem description: LLInventoryObject::rename corrects incoming string and remove odd spaces, for example converts string " " to empty string "", as the result empty string can be set as InventoryObject name. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/505/ --HG-- branch : product-engine
2010-06-08EXT-7627 FIXED Wearing an item now doesn't open the wearable editing panel.Vadim Savchuk
Fix: - Save the UUID of a newly created wearable to start editing it right after it gets worn. This approach replaces a temporary hack that invoked the editing panel whenever an item gets worn (if the Appearance SP is opened at the time). The hack only happened to work sometimes because the editing panel failed to open. Other changes: - Removed a check for inventory item completeness from LLAgentWearables::editWearable(). because the check often fails and doesn't appear to be needed at all. - Added warning messages to LLAgentWearables::editWearable() so that it's easier to debug. - Replaced duplicated code in LLPanelOutfitEdit::onEditWearableClicked() with a call to gAgentWearables.editWearable(). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/529/ --HG-- branch : product-engine
2010-06-08mergeMike Antipov
--HG-- branch : product-engine
2010-06-08EXT-7644 FIXED Implemented functionality for locking outfit modification ↵Alexei Arabadji
controls and used it for 'save outfit' action. 1 Added functionality for locking outfit in LLAppearanceMgr. Outfit should be locked when outfit related operation is started(now it is used for updateBaseOutfit) and unlocked when operation completed or timeout is exceeded. 2 Added outfit saved and outfit lock changed signals to LLOutfitObserver. 3 Updated LLPanelOutfitsInventory and LLPanelOutfitEdit with functionality of controlling 'save outfit' controls state('save outfit' controls should be enabled only if outfit isn't locked and outfit is dirty). 4 Renamed action label of method LLPanelOutfitsInventory::isActionEnabled "make_outfit" to "save_outfit". --HG-- branch : product-engine
2010-06-08EXT-7503 WIP Improved LLInventoryModel::updateItem to avoid an extra calls ↵Mike Antipov
of notifyObservers while updating calling card item. - added check on whether avatar name exists in Name Cache before using its getter with callback (which raises notifyObservers). Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/526/ --HG-- branch : product-engine
2010-06-08mergeTofu Linden
2010-06-08merge from PE's viewer-trunkTofu Linden