Commit Graph

11707 Commits (ea2005edf062b69e88261e2a824bdbb6e2b2db7d)

Author SHA1 Message Date
Tofu Linden 400f7db2d9 Conflict resolution. Erring on the side of viewer-release. 2010-07-26 14:01:45 +01:00
Vadim Savchuk 5224e3d217 merge
--HG--
branch : product-engine
2010-07-26 15:16:21 +03:00
Vadim Savchuk 27e1734484 Merge from default branch
--HG--
branch : product-engine
2010-07-26 15:15:09 +03:00
Paul Guslisty bdacad23bb EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel

- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.

Reviewed by Mike Antipov,  Neal Orman and Richard Nelson at https://codereview.productengine.com/secondlife/r/790/

--HG--
branch : product-engine
2010-07-26 14:42:21 +03:00
Mike Antipov 002bbd885b EXT-8318 FIX IMPROVED converted EOLs
--HG--
branch : product-engine
2010-07-26 13:04:28 +03:00
Tofu Linden 44d0fd81ee (hairy) merge from viewer-release 2010-07-26 10:34:39 +01:00
Tofu Linden fe91462d62 merge from PE's viewer-release 2010-07-26 10:07:35 +01:00
Mike Antipov 8e461d902e EXT-8318 FIX IMPROVED Code is refactored - avoid using of a separate call of the MultiByteToWideChar to get length of output string.
Assumprion is: wide char buffer requires not more than input string length plus one for a null terminator.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/

--HG--
branch : product-engine
2010-07-26 11:44:50 +03:00
Alexei Arabadji 2e9671a8a8 EXT-8329 FIXED Provided disabling 'Wear Item' button after item was worn.
Details:
1 Updated condition is item can be worn considering situation when item is copied in COF but is not worn.
2 Avoided code duplication in method LLOutfitsList::canWearSelected()

reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/785/

--HG--
branch : product-engine
2010-07-26 10:33:43 +03:00
Richard Linden 50d8cc6d37 first pass ui rendering performance improvements 2010-07-23 22:07:15 -07:00
Andrew A. de Laix 6ad892aa95 Fix EXT-8483 second iteration: use old nodeId when available but try new machine id when not so reported id stays consistent with prior versions most of the time. 2010-07-23 15:25:49 -07:00
Monroe Linden 112abfe888 More cleanup around llmediadataclient.
LLMediaDataClient::Request no longer stores the LLSD payload -- it now uses the link to the LLVOVolume (which it was already keeping around) to generate the LLSD for the request at the time it's sent.

LLMediaDataClient::Request no longer stores a capability name.  Instead it uses the reference to its parent LLMediaDataClient subclass to refer to it as needed.

LLMediaDataClient::Request is now a base class, with subclasses for each specific request type -- GET, UPDATE, and NAVIGATE.

Responders are now created by a virtual method in the LLMediaDataClient::Request subclass instead of being created by the MDC.  This allows different request types to use different responder classes.

Fixed an issue with LLMediaDataClient::QueueTimer and LLMediaDataClient::RetryTimer that caused the unit test to fail (they now do all the work in their tick() functions instead of using the destructor).
2010-07-23 13:36:48 -07:00
Brad Payne (Vir Linden) 0c5a5934d8 merge 2010-07-23 16:34:17 -04:00
Brad Payne (Vir Linden) d9f01a7c5a Fixed reversal of replace/add logic with clothing 2010-07-23 16:24:17 -04:00
Brad Payne (Vir Linden) ee40479c3d Removed a bunch of templates and inlining through the miracle of boost::function 2010-07-23 16:22:20 -04:00
Sergei Litovchuk 4eee391b49 Fixed PROJECT_secondlife-bin_TEST_lllogininstance unit test to fix Linux build.
--HG--
branch : product-engine
2010-07-23 18:04:15 +03:00
Vadim Savchuk 8428b4055b EXT-8420 PARTIAL_FIX Localized the "Online" string used as a group member status.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/792/

--HG--
branch : product-engine
2010-07-23 18:11:04 +03:00
Vadim Savchuk de81d9d8a7 EXT-8481 FIXED Wear button in My Outfits being enabled when worn item is selected.
- Fixed condition for enabling the Wear button in My Outfits.
- The button was always enabled when when COF change completes, I fixed that as well.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/800/

--HG--
branch : product-engine
2010-07-23 18:06:49 +03:00
Mike Antipov d6726e6e4b EXT-8299 FIXED Added rearranging of the group accordion to fit all space if only General tab is visible.
Also fixed name of accordion in code to be consistent with xml.
Replaced findChild with getChild (when getting accordion and its tabs) to avoid extra checks against NULL of returned pointers
 and have warnings in log is xml is not consistent with code.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/798/

--HG--
branch : product-engine
2010-07-23 17:42:06 +03:00
Mike Antipov c136e575e2 EXT-8394 FIXED Added "New Note" to dictionary of predefined Inventory items/folders.
"New Note" should be translated on other languages in strings.xml

 Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/795/

--HG--
branch : product-engine
2010-07-23 17:21:53 +03:00
Loren Shih 056685d9d4 automated merge 2010-07-23 10:13:11 -04:00
Alexei Arabadji a8632670db EXT-6739 FIXED Provided updating of object inspector gear menu 'Touch' and 'Sit' entries.
Details:
1 Provided using Object.EnableSit and Object.EnableTouch callbacks for both object menu and inspector gear menu. Now default menu item label stores in
hash map and since callback receives triggered control no need to hardcode updating menu item labels from callback.
2 Removed redundant attribute 'parameter' from menu xml's since now handler callbacks receives triggered menu item as function parameter.
3 Replaced LLObjectEnableTouch class with enable_object_touch function, since there no need on triggering callback on menu commit event.
4 Added symmetric method LLMenuItemGL::getValue().
5 Removed unused "Object.EnableGearSit" callback.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/774/

--HG--
branch : product-engine
2010-07-23 17:06:27 +03:00
Tofu Linden 77911533dc merge from PE's viewer-release 2010-07-23 09:51:15 +01:00
Mike Antipov 66bdd0903d merge
--HG--
branch : product-engine
2010-07-23 10:34:27 +03:00
Mike Antipov 3c4f82b298 EXT-8318 ADDITIONAL FIXED ensure that thousands separator is in utf8 format (on Windows) before converting it to LLWString.
Problem on Windows:
==================

LLPanelMainInventory::updateItemcountText() formats number using viewer locale.
non-break space is detected as unknown symbols while converting utf8str_to_wstring when formatted text is set to LLTextBox.

FIX:
===

Added converting of string to multi-byte string and then to utf8 string while formatting on Windows.
  created opposite to "ll_convert_wide_to_string" function "ll_convert_string_to_wide" and helper function to call both of them.
  It is used now to convert result of formatted string while formatting integer number in locale.

Fix affects Windows only.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/

--HG--
branch : product-engine
2010-07-23 10:26:28 +03:00
Andrew A. de Laix 7ee930ea4a Merge 2010-07-22 17:36:59 -07:00
Andrew A. de Laix 7600b0bcd0 Fix EXT-8483: switch to LLMachineID::getUniqueID which should always work on windows (no dependency on Netbios). 2010-07-22 17:36:13 -07:00
Palmer aac8bf0988 EOL added. 2010-07-22 15:26:55 -07:00
Palmer a44551e282 OH NO! This may be my last merge! You might want to read all of this...
Whatever will I do if I can no longer merge in the indra codebase?
What has my life come to?
Without merging, who am I?
Why am I here?
I like cupcakes.
Merging makes me feel complete.
Like doing something without really doing something.
I say merge, and it merges.
I like not having to do three way diffs, but still claim I'm merging.
Three way merging is no fun.
You're still reading this.
You deserve a cupcake.
You read checkins.  You're special.  You're either dessie, erica, or brad.
I'll miss you guys.
Keep them doggies mergin.
2010-07-22 15:25:37 -07:00
Palmer 7d73afe895 EXT-7145 - Handle http redirects in viewer properly. Didn't work before.
Reviewed by Bao and Babbage
2010-07-22 15:20:45 -07:00
Christian Goetze (CG) fe8a5a007a merged from "viewer-hotfix" 2010-07-22 13:29:05 -07:00
Andrew Dyukov 051f834a41 EXT-7511 FIXED Fixed cropping of selection in Edit Outfit.
Cropping was caused by drawing separator over bottom part of the item (including selection).

- Moved separator under the item- not inside of it. This way item and selection are not cropped. The only requirement for using lists that consist of items with separators is that their item_pad attritubute is >= height of separator.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/

--HG--
branch : product-engine
2010-07-22 23:04:27 +03:00
Andrew Dyukov 39c9ec49bf EXT-8342 FIXED Fixed displacement of decription textbox in Place Profile after reshape.
Bug was reproducible on Windows and not on Linux because of different moment when onTopLost() was called for textbox.
On Windows it happened only after reshape, on Linux- before reshape. Made windows behaviour in case of top lost consistent with Linux behaviour.

- An if was added into LLPanelPlaceInfo::reshape to force collapsing description textbox on Windows at the beginning of reshape
(the only case when reshape is skipped there now is when it's caused by expanding/collapsing this textbox, so called_from_parent for panel is FALSE).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/779

--HG--
branch : product-engine
2010-07-22 22:47:15 +03:00
Richard Linden a9ff46d899 merge 2010-07-22 12:09:33 -07:00
Richard Linden 98bd370952 fix for checkbox truncation 2010-07-22 12:09:23 -07:00
Loren Shih 75cfa9a0c3 EXT-8051 FIXED Change cameraCustomizeAvatar calls to use gAvatarp->isUsingBakedTextures
Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-22 15:06:08 -04:00
Xiaohong Bao 10c6121db6 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-07-22 12:54:31 -06:00
Eli Linden d2d84a1c99 ND-47671 WIP FR linguistic 2010-07-22 11:34:57 -07:00
Xiaohong Bao 5f400b3b7c more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D 2010-07-22 11:38:26 -06:00
Xiaohong Bao 731086241b EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin llimagegl.cpp] 2010-07-22 11:28:16 -06:00
Sergei Litovchuk 6e88f198ed EXT-5403 FIXED texture picker to scroll to selected texture initially after being open.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/736/.

--HG--
branch : product-engine
2010-07-22 19:02:17 +03:00
Sergei Litovchuk 9aa622ea1f EXT-8421 FIXED hardcoded strings.
- Replaced hardcoded strings under Group Profile Land/Assets with related strings from strings.xml
- Added new string "Group" to strings.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/794/.

--HG--
branch : product-engine
2010-07-23 16:03:06 +03:00
Vadim Savchuk 4ce796b317 Merge from default branch
--HG--
branch : product-engine
2010-07-23 15:04:03 +03:00
Mike Antipov 3ec027b316 EXT-8318 ADDITIONAL FIXED avoid an extra copy of std::string
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/

--HG--
branch : product-engine
2010-07-23 12:53:37 +03:00
Dessie Linden 9838884d90 pushed 2-1-release tag 2010-07-22 09:01:39 -07:00
Brad Payne (Vir Linden) 35837f2d38 EXT-8153 FIX - modified replace logic when wearing multiple items 2010-07-22 11:11:22 -04:00
Vadim Savchuk 3dc2c420eb EXT-8392 FIXED Localized folder name in the landmark creation notification.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/789/

--HG--
branch : product-engine
2010-07-22 18:03:41 +03:00
Vadim Savchuk 6a11c31318 EXT-8378 FIXED Made area format localizable in World Map and Group Info -> Roles.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/788/

--HG--
branch : product-engine
2010-07-22 17:59:36 +03:00
Vadim Savchuk bf468e0ffe Merge from default branch
--HG--
branch : product-engine
2010-07-22 18:02:48 +03:00
Mike Antipov f6c08d4510 EXT-8459 FIXED preventing crashes: 1) ensure that pointer to inventory item is still valid when landmark is loaded from notecard and 2) adding a check for region capability
There are two reasons of the crash reported in the bug:
 * absence of the "CopyInventoryFromNotecard" capability in region (which leads to crash while logging of a LL_ERRS)
 * referencing to an invalid pointer to LLInventoryItem in callback.


The first issue is fixed by preventing sending of the "CopyInventoryFromNotecard" message if it is not supported
 (in the "copy_inventory_from_notecard()")

The second issue caused by such reason:
 * Notecard stores LLPointer to each embedded inventory item
 * When Landmark is clicked it should be opened in Places Panel and inventory item should copied into agent inventory
 * If it is unknown to agent it is requested and pointer (but not LLPointer!) to inventory item was bound to an appropriate callback
 * Then when landmark is loaded that inventory item is copied to inventory.
 * If notecard was closed before callback was trigged all instances to embedded inventory items were destroyed.
This leads to crash when trigged callback tries to reference to bound pointer to inventory item (for landmarks)

Fix is to pass LLPointer instead of pointer to inventory item into callback to ensure item is valid when it is needed.
Details:
 * updated LLEmbeddedItems::getEmbeddedItem() to return LLPointer to inventory item (and renamed to getEmbeddedItemPtr)
 * updated LLViewerTextEditor::openEmbeddedItem() to get LLPointer to inventory item
 * updated LLViewerTextEditor::openEmbeddedLandmark() to get LLPointer to inventory item

Patch also contains some more places where pointer is replaced with LLPointer to be consistent.

NOTE: there are several LLViewerTextEditor::openEmbeddedXXX() methods which still get pointer to inventory item.
 It is safe for now because they use it synchronously. I have added a note at their declaration.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/784/

--HG--
branch : product-engine
2010-07-22 12:46:57 +03:00