Commit Graph

11364 Commits (7253c7eeb156f9f6cd75f52b0df856ec8ef165fb)

Author SHA1 Message Date
Andrew Dyukov 7253c7eeb1 EXT-7511 FIXED Fixed item selection cropping in Edit Outfit
Restored changeset which was lost after merge 58571b4e704b.

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

--HG--
branch : product-engine
2010-08-04 21:13:11 +03:00
Vadim Savchuk 75e76ea248 EXT-8524 FIXED Non-ASCII character corruption in date.
Convert formatted date from system charset to UTF-8 on Windows (other OSes don't require this).

See http://jira.secondlife.com/browse/EXT-8318 for more details.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/834/

--HG--
branch : product-engine
2010-08-04 16:52:22 +03:00
Aimee Linden 80b37e50fa Merge 2010-08-04 13:19:31 +01:00
Aimee Linden fd4cbed787 DEV-52379 FIXED (Supplementary to my supplementary) Fix Linux build breakage ... oopsie. 2010-08-04 13:18:16 +01:00
Aimee Linden e77ac4ca64 Merge 2010-08-04 12:56:41 +01:00
Aimee Linden d3db9dd2a1 DEV-52379 FIXED (Supplementary) Viewer is not successfully caching object geometry
Encapsulated building of the cache filename into a help function to prevent code
 duplication.

Reviewed by Tofu.
2010-08-04 12:52:44 +01:00
Tofu Linden dea1266370 merge from PE's viewer-release 2010-08-04 11:53:28 +01:00
Paul Guslisty e3a33b068d EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after it was opened by 'Replace' item of context menu)
Restored from BAD MERGE at 5b5cc4a8642d

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

--HG--
branch : product-engine
2010-08-04 11:38:29 +03:00
Xiaohong Bao 08b74c369f Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-03 18:27:58 -06:00
Xiaohong Bao 85c970e847 fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5
and     EXT-7397: decoding textures get stuck in REQ status
2010-08-03 18:26:47 -06:00
Christian Goetze (CG) a7a5a90852 Pulled build.sh change from viewer-release 2010-08-03 17:08:43 -07:00
Eli Linden 4b2f46af40 CT-575 WIP DE JA ES translation for set16 for Viewer 2.1.1 2010-08-03 14:59:14 -07:00
Vadim Savchuk 4b00b98844 EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits consisting of body parts only.
Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu.
They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables.

By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/832/

--HG--
branch : product-engine
2010-08-03 23:28:51 +03:00
Eli Linden ae4bc473e5 CT-575 FIX linguistic work from q/viewer-release lost in dessie/viewer-release. Re-comitting. 2010-08-03 11:17:35 -07:00
Vadim Savchuk e2135bd6dd Merge from default branch
--HG--
branch : product-engine
2010-08-03 16:28:58 +03:00
Tofu Linden 4f2641aef0 merge from PE's viewer-release 2010-08-03 13:33:06 +01:00
Christian Goetze (CG) d10b9a7f37 Pulled from "dessie/viewer-release" 2010-08-02 22:05:56 -07:00
Christian Goetze (CG) b3b8ef25e1 Eliminate the bad merge at "2026f824953f" 2010-08-02 17:03:55 -07:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Christian Goetze (CG) 4f6e814eaa Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard 2010-08-02 15:57:01 -07:00
Eli Linden a39b31abf8 CT-575 WIP FR PT linguistic 2010-08-02 10:52:35 -07:00
Vadim Savchuk b12201bf01 EXT-6542 Localized the "none/none" in the About land floater.
This is an additional fix to the one made in rev. 6788ff579917.

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

--HG--
branch : product-engine
2010-08-02 19:04:32 +03:00
Vadim Savchuk 3b7da51117 Merge from default branch
--HG--
branch : product-engine
2010-08-02 18:59:35 +03:00
Kent Quirk f423a69864 Merge. 2010-07-30 22:43:15 -04:00
Palmer d109457311 Upgraded NVIDIA 120 and 220 to class 1. They're performing too well. 2010-07-30 16:21:21 -07:00
Andrew Meadows 0847d29e0a fix for DEV-52379 (viewer is not successfully caching object goemetry)
There was a typo between the files saved and those loaded.
saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc
Q will review later ;-)
2010-07-30 13:32:07 -07:00
Kent Quirk afaa076b7d remove useless assert and its temp variable that broke the build. 2010-07-30 15:57:46 -04:00
Kent Quirk 8d707f0ed2 Merge 2010-07-30 10:15:48 -04:00
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Mike Antipov 122209c4a6 Merge from default branch
--HG--
branch : product-engine
2010-07-30 13:08:08 +03:00
Tofu Linden 966882b3d9 merge from PE's viewer-release 2010-07-30 10:06:30 +01:00
Tofu Linden 7a4174447a merge 2010-07-29 19:32:29 +01:00
Tofu Linden 1e44674f30 Backed out changeset b4c03b57a34f 2010-07-29 19:32:20 +01:00
Tofu Linden 018065aad2 Backed out changeset 61a2e2a8fb75 2010-07-29 19:32:07 +01:00
Vadim Savchuk 45adf1d612 EXT-8501 FIXED Check menu items always looked as checked.
Reason:
Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark.
Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string.

Fix:
Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string.

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

--HG--
branch : product-engine
2010-07-29 17:48:41 +03:00
Tofu Linden 2e520cb849 WEB-1819 PARTIAL follow-up tweak.
this makes a new externally-invoked search blank-out the old search
until it starts really loading.
2010-07-29 13:15:24 +01:00
Tofu Linden 5e2448347c WEB-1819 FIXED Find always resets to start page
(plus many dupes).

Enough seesawing, I hope - see WEB-1819 for discussion and the nature of the compromise.
Patch by Kitty Barnett, reviewed by my.
2010-07-29 12:50:25 +01:00
Tofu Linden 4a41273078 merge 2010-07-29 10:10:10 +01:00
Brad Payne (Vir Linden) f7009abf65 merge 2010-07-28 17:22:34 -04:00
Brad Payne (Vir Linden) e27170de34 EXT-8221 FIX - fixed invalid array index in a vector<LLMultiGesture*> 2010-07-28 17:22:03 -04:00
Eli Linden f08fef5c8e CT-575 WIP FR linguistic 2010-07-28 10:43:32 -07:00
Vadim Savchuk 3d14fe23fc EXT-8361 REFIXED Tooltips in Nearby Media window in the French viewer.
Restored a part of my fix that was somewhy reverted by Eli in rev. 0d364d4ddd91.

--HG--
branch : product-engine
2010-07-28 19:49:09 +03:00
Vadim Savchuk cf286ad963 EXT-8310 REFIXED Localized currency format in the Buy Land floater.
I'm actually restoring a part of the fix that was previosly committed in 75a1d14d6cc5 and then somewhy reverted in 0d364d4ddd91.

Trivial change, not reviewed.

--HG--
branch : product-engine
2010-07-28 19:27:10 +03:00
Vadim Savchuk 4cefba23d8 Merge from default branch
--HG--
branch : product-engine
2010-07-28 15:49:01 +03:00
Andrew Dyukov 5be77f8e8c EXT-2707 ADDITIONAL FIX Fixed wrong icon showing for coalesced objects in "Add More" panel.
Problem was caused by getting item's icon always with FALSE value of item_is_multi argument in LLPanelInventoryListItemBase::postBuild().

- Used II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS flag to determine whether item is multiobject and getting appropriate icon.

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

--HG--
branch : product-engine
2010-07-28 12:33:34 +03:00
Tofu Linden 76da1229ec merge from PE's viewer-release 2010-07-28 10:32:28 +01:00
Mike Antipov 6110cb6a36 EXT-8285 FIXED prevented wrong handling in accordion of the "scrollToShowRect" event from the child accordion tab's scroll container.
This problem begins from expanding accordion_tab:

1. adjustToFitScreen - calls adjustContainerPanel with "fit screen" rectangle (calls reshape() and resize()).
   Enter adjustContainerPanel("fit screen")
2. reshape calls ensureSelectedVisible -> scrollToShowRect...
   scrollToShowRect notifyParent about "scrollToShowRect" (notifiParent is sync call)
   Enter LLAccordionCtrl::notifyParent("scrollToShowRect")
4. AccordionCtrl handles "scrollToShowRect" notification and perform adjustContainerPanel with "another" rectangle.
   Perform adjustContainerPanel("another") // At least I have not seen 3rd recursive call of adjustContainerPanel
5. Exit LLAccordionCtrl::notifyParent("scrollToShowRect")
6. Exit reshape("fit screen").
7. setRect("fit screen").
8. Exit adjustContainerPanel("fit screen").
...
As result we get AccordionTab that reshaped to "another" rectangle and resized to "fit screen" rectangle.

+ Fixed by handling "scrollToShowRect" message in LLAccordionCtrlTab from "LLScrollContainer".

+ Removed the workaround comment.

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

--HG--
branch : product-engine
2010-07-28 10:59:53 +03:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Vadim Savchuk 7598015945 EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().
Reason:
When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes
all COF links of the clicked wearable type -- thus invalidating all previously
obtained LLViewerInventoryItems for those links -- and then passes such an
invalid item (item_to_wear) to addCOFItemLink() which of course crashes.

Fix:
1. Handle this case in wearItemOnAvatar(): don't try wearing COF items.
2. Disable the Wear button in the inventory SP when a COF item is selected.
3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/

--HG--
branch : product-engine
2010-07-27 22:34:34 +03:00
Paul Guslisty 7bec8b2a9e EXT-8366 FIXED ([HARD CODED] ALL LANGS Whole Item Profile window is untranslated in the French viewer)
- Added 'name' attribute for untranslated panel in EN and all other locales

Reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/808/

--HG--
branch : product-engine
2010-07-27 18:45:32 +03:00