Commit Graph

11874 Commits (492c189e24242cedd10dca47c31ffddccf200fcc)

Author SHA1 Message Date
Andrew Dyukov 492c189e24 EXT-8425 ADDITIONAL FIX Fixed broken translation of accelerators which was introduced by fix of this bug in changeset 14331:11122e1fc5cf.
Removed "Key_" prefix from new key strings and from function that finds them, because it broke translation of old accelerator strings.

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

--HG--
branch : product-engine
2010-08-17 17:10:13 +03:00
Vadim Savchuk 823588b393 Merge from default branch
--HG--
branch : product-engine
2010-08-16 16:12:16 +03:00
Andrew Dyukov f523a589a7 EXT-8536 FIXED Fixed wrong behaviour of slidercontrol's lineeditor revert on escape.
Though bug description mentioned only appearance, bug reproduced for all slidercontrols. The cause of returning on escape to old value
instead of last commited one was that on commit slidercontrol set text for it's lineeditor which was the same as the one currently typed
into lineeditor(and it seems logical). But LLLineEditor::setText() has check at it's beginning which compares text which is being set to the
one which is already there. If this check succeeds, we exit the method and thus saving of value for revert is not reached. That's why when revert happened
on escape older value then the last commited was set in lineeditor.

- Added additional call of setText() in sliderctrl to force changes in currently set text so that on next call with "real" text saving of reverted value was reached.

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

--HG--
branch : product-engine
2010-08-13 19:33:18 +03:00
Tofu Linden 7f08555143 merge from viewer-release 2010-08-13 12:40:45 +01:00
Tofu Linden 40eda71ff0 merge from PE's viewer-release 2010-08-13 12:39:47 +01:00
Tofu Linden 2dd1854d98 merge 2010-08-13 12:26:25 +01:00
Tofu Linden 9989c304c9 trivial comment changes while I was in this code. 2010-08-13 12:25:59 +01:00
Xiaohong Bao 0742f89208 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-12 21:53:30 -06:00
Xiaohong Bao 4627c4b698 Fix for EXT-8578: Blurry image in profile never resolves - texture queue problem? 2010-08-12 21:52:22 -06:00
Christian Goetze (CG) da8374f233 Pulled "dessie/viewer-release" into "dessie/viewer-public". 2010-08-12 12:44:21 -07:00
Christian Goetze (CG) cde71ddc88 Pulled "viewer-hotfix" into "viewer-release". 2010-08-12 12:42:25 -07:00
Christian Goetze (CG) 3678a3e6e5 Pulled "viewer-hotfix" into "viewer-release". 2010-08-12 12:29:51 -07:00
Tofu Linden 50d5401e94 merge from viewer-release 2010-08-12 14:21:05 +01:00
Tofu Linden c574a819ec Fix a bunch of typos in new enums, one of which was causing a build failure. 2010-08-12 14:20:33 +01:00
Vadim Savchuk 44adcdecd0 EXT-8473 FIXED Fixed renaming inventory items without hitting Enter.
Problem:

The bug was caused by the fix of EXT-6682 that prematurely forgets the item
being renamed (by resetting mRenameItem) whenever the renamer input field loses focus.
That's why we couldn't actually finish renaming item.

Fix:

The code is quite messy, but I'll try to explain.

There are three cases when we should hide the renamer:
1) ESC key is hit (just hide).
2) ENTER key is hit (rename, then hide).
3) renamer loses focus (rename, then hide).

In the first two cases we manually remove the renamer from the popups
list -- by calling gViewerWindow->removePopup(mRenamer).
In the third case that's done automatically.
So, in all cases the onRenamerLost() pop-up is called that hides the renamer
and only *then* resets mRenameItem.
Not only this approach fixes the bug -- I hope it's a bit more straightforward too.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/854/

--HG--
branch : product-engine
2010-08-12 16:16:57 +03:00
Vadim Savchuk 5de5510f58 EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are subsets of the current outfit.
We allowed wearing any outfit that contains non-worn items.
Now it appears to be wrong, therefore and I changed condition so that
we allow wearing any outfit (or folder) that contains the full set of body parts.

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

--HG--
branch : product-engine
2010-08-12 16:13:48 +03:00
Tofu Linden 4281e2bd01 EXT-8589 FIXED Nothing happens if choose 'Invite to Group' from avatar's 3D context menu
The groups-chooser was auto-closing when the IW selection was lost, which in the case of right-clicking on (other) avatars is immediately.  The 'hg blame' is lost in merge-fubarism so I can't track why this behaviour was ever introduced, but I can think or (or find) no reason to autoclose in this case - the groups picker dialog doesn't even use the current selection, let alone care if it's lost.
2010-08-12 14:12:54 +01:00
Sergei Litovchuk dd692f17ab EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point.
Worked around by checking gAgentAvatarp for being valid.

I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/.

--HG--
branch : product-engine
2010-08-12 15:56:51 +03:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Tofu Linden 6c79b84600 merge from PE's viewer-release 2010-08-12 12:51:00 +01:00
Paul Guslisty 7a0b016c8c EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable

- Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name

- Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed

Restored diff after bad merge at 13817

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

--HG--
branch : product-engine
2010-08-12 13:48:36 +03:00
Paul Guslisty 6cab04ce2f EXT-8599 FIXED (Search Floater - \"loading\" and \"Done\" text in lower left is cut-off)
- Added height parameters and removed unnecessary bottom parameter

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

--HG--
branch : product-engine
2010-08-12 13:20:52 +03:00
Paul Guslisty 7312471e7f EXT-7951 FIXED (Mini-Location panel appearance design issues)
- Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel

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

--HG--
branch : product-engine
2010-08-12 13:19:23 +03:00
Xiaohong Bao 11c4985674 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-11 19:32:00 -06:00
Xiaohong Bao 5be5c3f0da 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-11 19:31:20 -06:00
Dessie Linden 51d460089e Changed channel info back to Second Life Developer 2010-08-11 14:04:27 -07:00
Dessie Linden 67d1837ce7 Updated viewer patch number & channel 2010-08-11 11:14:59 -07:00
Loren Shih bd9ead6794 automated merge 2010-08-11 13:55:39 -04:00
Andrew Dyukov ec28b9af16 EXT-8425 FIXED Translated names of "Home" and "Esc" keys shown in shortcuts.
Each key has KEY (typedef of U8) represantation which is paired with text version of key.
To get strings corresponding to keys LLKeyboard::stringFromKey() is used.

- Added translation of keys into LLKeyboard::stringFromKey().

- Added corresponding strings into strings.xml.

- Changed LLTrans::getKeyboardString() so that it correctly process key names that are not found in strings.xml(returns English name instead of "MissingString").

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

--HG--
branch : product-engine
2010-08-11 20:39:34 +03:00
Loren Shih 7836f0fff3 EXT-8650 Can wear mutliple copies of a no-copy item via object links
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code

Lots of files changed, but this is mostly just a trivial function call rename.  This change is very low risk.
2010-08-11 12:34:27 -04:00
Vadim Savchuk bf1df45f61 Merge from default branch
--HG--
branch : product-engine
2010-08-11 16:32:04 +03:00
Tofu Linden 79e767b91d merge from viewer-release 2010-08-11 13:44:35 +01:00
Tofu Linden 32fe67ec2f merge from PE's viewer-trunk 2010-08-11 13:44:03 +01:00
Tofu Linden f9a61bd30d merge from PE's viewer-release 2010-08-11 13:42:42 +01:00
Eli Linden 766eaf9a50 EXT-8376 FIX en_xui_change for IT truncation; DE fix 2010-08-10 17:21:36 -07:00
Eli Linden 205a5c6083 Merge 2010-08-10 16:11:28 -07:00
Eli Linden 10641acf4c EXT-8370 WIP remove old overrides 2010-08-10 16:09:11 -07:00
Xiaohong Bao 0582257a8a Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-10 16:44:12 -06:00
Xiaohong Bao b9cc3a34da EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5 2010-08-10 16:43:31 -06:00
Eli Linden f5ae33fa53 CT-575 WIP restore PL translation that got lost 2010-08-10 15:24:16 -07:00
Vadim Savchuk 863e380fb6 EXT-8576 FIXED Only attachments are worn if multi-select items on 'My Outfits' tab and press 'Wear' button.
Reason: avatar appearance was not updated if the last selected item was an attachment.
Fix: make sure appearance is updated afterwards, regardless of items types.

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

--HG--
branch : product-engine
2010-08-10 22:38:29 +03:00
Andrew Dyukov 79be630d08 EXT-8255 FIXED Added confirmation dialog when removing items.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/849/

--HG--
branch : product-engine
2010-08-10 19:16:18 +03:00
Tofu Linden 2779d28848 merge from PE's viewer-trunk 2010-08-10 16:31:07 +01:00
Sergei Litovchuk f88890afe5 EXT-3981 FIXED changeset e1e225cd1deb. Disabled folder view automatic scrolling while background fetch is in progress.
Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/835/.

--HG--
branch : product-engine
2010-08-10 18:21:12 +03:00
Sergei Litovchuk 11517b8320 Backed out changeset: e1e225cd1deb
--HG--
branch : product-engine
2010-08-10 17:39:03 +03:00
Dave Parks e62e31a2f2 Fix for crash when deferred rendering enabled and toggling wireframe.
(transplanted from 3886dff9a2829c7a8957d2cc48742e0678ec06a6)
2010-08-10 09:13:41 -05:00
Vadim Savchuk 0977b27b2b Merge from default branch
--HG--
branch : product-engine
2010-08-10 16:23:15 +03:00
Vadim Savchuk 9d6fd1c63f Merge from default branch
--HG--
branch : product-engine
2010-08-10 16:11:33 +03:00
Tofu Linden 77330d5c31 (hairy) merge from viewer-release 2010-08-10 14:04:35 +01:00
Tofu Linden 83f108503a merge from PE's viewer-trunk 2010-08-10 14:02:21 +01:00