Commit Graph

11337 Commits (d1094573117db0a951a7e6159a352b0f4c8a8a24)

Author SHA1 Message Date
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 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
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
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
Paul Guslisty a3690e080e EXT-8350 FIXED ([HARD CODED] ALL LANGS Untranslated folder names under French Group Profile (roles and powers))
Added translation of folders to the strings.xml

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

--HG--
branch : product-engine
2010-07-27 18:44:57 +03:00
Loren Shih a332865872 automated merge 2010-07-27 10:24:53 -04:00
Tofu Linden d55264bf13 Fix implicit downcast in world map change. 2010-07-27 10:51:35 +01:00
Tofu Linden e1effcb285 merge from PE's viewer-release 2010-07-27 10:41:53 +01:00
Tofu Linden f63abd5168 merge 2010-07-27 10:33:17 +01:00
callum f531dd2bc5 Implementation for EXT-7291 (World Map in the Viewer2 needs a way to type in region coordinates)
Reviewed by PB
2010-07-26 15:55:49 -07:00
Loren Shih 34ab18d0c2 EXT-8918 FIXED Incorrect right-click options for library items
Library items have "Share" disabled.
2010-07-26 18:14:32 -04:00
Loren Shih 4a361046f3 EXT-8229 FIXED Add "--no options--" automatically instead of special casing for it in right-click menus
Changed logic so that the menu is post-processed and, at that time, nooptions is added if the menu is seen to be empty.
2010-07-26 17:53:48 -04:00
Paul Guslisty d6a13498b7 EXT-8232 FIXED (Truncation of German strings on Buy Land window)
- Added wrap=\"true\" for text boxes in which truncation occurs and increased their height to contain another one line

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

--HG--
branch : product-engine
2010-07-26 18:09:46 +03:00
Andrew Dyukov 3b88ba4351 EXT-2707 FIXED Fixed incorrectness of coalesced objects icons in inventory.
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result.

- Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject.

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

--HG--
branch : product-engine
2010-07-26 16:58:40 +03: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 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
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
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 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