Commit Graph

9224 Commits (597485cceb57c4a8f23f1d760a5dfd83cc5271a6)

Author SHA1 Message Date
Vadim Savchuk 597485cceb merge
--HG--
branch : product-engine
2010-04-20 17:38:35 +03:00
Vadim Savchuk 2da402498f Merge from default branch
--HG--
branch : product-engine
2010-04-20 17:37:44 +03:00
Yuri Chebotarev 181241e747 additional commit for EXT-6625 Nearby Chat does not gain focus when clicked at the top
reply to https://codereview.productengine.com/secondlife/r/267/#review471
add comments to code

--HG--
branch : product-engine
2010-04-20 17:32:23 +03:00
Yuri Chebotarev 9d74b586b3 fix after wrong merge for EXT-4082 - long string
--HG--
branch : product-engine
2010-04-20 17:16:27 +03:00
Yuri Chebotarev 407cf3bd08 merge
--HG--
branch : product-engine
2010-04-20 17:14:00 +03:00
Eugene Mutavchi 5acf8a5f13 Fixed normal bug EXT-6807(Object's chicklet shows context menu for bottom bar)
- moved the common code (menu stuff handling) from LLIMP2PChiclet, LLAdHocChiclet, LLIMGroupChiclet to their parent LLIMChiclet
 - added popup menus to LLInvOfferChiclet and LLScriptChiclet (notice that just the closing menu item was added because these chiclets are not connected with IM sessions.)
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/254/

--HG--
branch : product-engine
2010-04-20 16:52:32 +03:00
Yuri Chebotarev 5c78d1f1a9 fix for EXT-6625 Nearby Chat does not gain focus when clicked at the top
https://codereview.productengine.com/secondlife/r/267/
mantipov

--HG--
branch : product-engine
2010-04-20 16:18:18 +03:00
Yuri Chebotarev a3eab97387 fix for EXT-6037 Nearby Speakers floater does not remember size and position on relogging
https://codereview.productengine.com/secondlife/r/270/
reviewed mantipov

--HG--
branch : product-engine
2010-04-20 16:06:39 +03:00
Yuri Chebotarev 6ed8c492f5 fix for EXT-4082 Normal Uploading huge image crashes viewer
https://codereview.productengine.com/secondlife/r/11/
reviewed Tofu Linden

--HG--
branch : product-engine
2010-04-20 15:47:02 +03:00
Alexei Arabadji 3c45631cbc Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
2010-04-20 14:47:17 +03:00
Alexei Arabadji 54d632fc2b fixed major EXT-6905 Inventory offer from another resident appears like notification from object;
Fixed regression introduced by rev. 050ab9232a5a, provided passing payload parameter "give_inventory_notification" to notification.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/273/

--HG--
branch : product-engine
2010-04-20 14:45:15 +03:00
Tofu Linden 5952fbca31 merge from viewer-hotfix 2010-04-20 12:29:20 +01:00
Dmitry Zaporozhan f260d52c75 Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is broken.
NOTE: this is a temporary fix, see EXT-6564(Fix wearable editing panels) for more info.
Fix info:
- Moved edit wearable button to place where it does not break widget paddings.
- Updated code that calculates button position.
- Sending button to front to ensure it is clickable and visible.

Not reviewed.

--HG--
branch : product-engine
2010-04-20 13:46:43 +03:00
Tofu Linden db5455b73a trivial comment fix. 2010-04-20 11:46:26 +01:00
Tofu Linden 625b15fa75 merge from PE's viewer-trunk 2010-04-20 10:30:11 +01:00
Dmitry Zaporozhan 1ce1e7f9a1 Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none needs to be localized
Added "DefaultMimeType" string to strings.xml to make "none/none" mime type localizable.
Replaced all occurrences of "none/none" string with call to static method.

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/265/

--HG--
branch : product-engine
2010-04-20 11:11:33 +03:00
Paul Guslisty 53e4718a46 Fixed normal bug EXT-6837 ([TRUNCATION] Mundo > Sol > Editor del entorno > Cielo avanzado > Editor del ciclo de un día. \"Configuración del fotograma clav\" should be \"Configuración del fotograma clave\".)
- Some redesign of floater_day_cycle.
- Main changes:
    increased view_border size;
    moved controls to the right of increased view_border to the right;
    increased spinner width to see all its content;
    moved 'Play' and 'Stop!' buttons in one row with 'Use estate time' button.

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

--HG--
branch : product-engine
2010-04-20 07:51:34 +03:00
Paul Guslisty 861f8641f8 Fixed normal bug EXT-6817 ([TRUNCATION] Mundo > Perfil del lugar > Region/Estate > REGIÓN/ESTADO > Estado. txt overlap the nexts windows.)
- Increased panel and view_border size, moved name_lists to the right

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

--HG--
branch : product-engine
2010-04-20 07:48:40 +03:00
Paul Guslisty 74ec5c6622 Fixed normal EXT-6729 ([TRUNCATION] SELECTOR DE COLOR. \"(arrástralo abajo para g\" should be \"(arrástralo abajo para guardarlo)\" or...)
- Applied word wrap

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

--HG--
branch : product-engine
2010-04-20 07:46:38 +03:00
Paul Guslisty 8b0c026007 Fixed normal bug EXT-6801 (EXT-6801 ([TRUNCATION] multiple langs. Me > preferences > graphic > advanced))
- Made labels of sliders wider
- Increased distance between radio groups

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

--HG--
branch : product-engine
2010-04-20 07:44:33 +03:00
Monroe Linden 41357bb012 Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix 2010-04-19 18:02:56 -07:00
Monroe Linden c3fa45282f Fix for EXT-6925 (Mime type association missing for video/* wildcard).
In mime_types*.xml, added <impl> sections to the mimetype entries for video/* and audio/* which point to the quicktime plugin on Mac/Windows and gstreamer on Linux.

Reviewed by Callum at http://codereview.lindenlab.com/1252035
2010-04-19 17:19:35 -07:00
Richard Nelson 3a7490e492 merge 2010-04-19 17:03:52 -07:00
Richard Nelson 3afda3d1c0 EXT-6921 - Media Volume Changes changes system volume on WinXP
reviewed by Callum
2010-04-19 17:01:47 -07:00
Brad Payne (Vir Linden) 7f0a778990 merge 2010-04-19 13:53:57 -04:00
Brad Payne (Vir Linden) aa5e494e0c For EXT-6809 - fixes suggested by Nyx code review 2010-04-19 13:52:59 -04:00
Vadim Savchuk 300651e2c8 Fixed bug EXT-6852 ([STRING IN EN] Media settings : Owner, Group, and Anyone).
Added names to nameless textboxes.
Trivial change, not reviewed.

--HG--
branch : product-engine
2010-04-19 19:19:29 +03:00
Vadim Savchuk 7f2ca84f5f Unhardcoded snapshot upload price in my fix for EXT-6606 (Set As Profile Pic uploads and charges user L$10 without confirmation).
Reviewed by Richard: https://codereview.productengine.com/secondlife/r/217/

--HG--
branch : product-engine
2010-04-19 18:37:36 +03:00
Vadim Savchuk d88a465a46 Fixed bug EXT-6842 ([I18N] Date format in Profile - mm/dd/yyyy needs to be: yyyy/mm/dd for Japanese).
- Made avatar registration date localizeable.
- Specified localization templates for English, Japanese and German.

Reviewed by Mike: https://jira.secondlife.com/browse/EXT-6842

--HG--
branch : product-engine
2010-04-19 17:56:09 +03:00
Mike Antipov 2e062a8ecb Fixed normal bug EXT-6899 (String changes to default and null results Groups List help text)
* Updated help texts in Groups List according to requirements in the ticket.

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

--HG--
branch : product-engine
2010-04-19 17:26:14 +03:00
Brad Payne (Vir Linden) 70a13fb322 merge 2010-04-19 10:26:11 -04:00
Tofu Linden 1c352ebb5b repair merge from viewer-hotfix w.r.t. agent API changes. 2010-04-19 15:23:04 +01:00
Alexei Arabadji d57e8ecc7e fixed EXT-6848 Avoid creation of dummy objects in LLOnlineStatusToast and LLPanelGenericTip classes.
* decoupled tip toast panel related logic from class LLTast;
* moved documentation comment of  LLPanelGenericTip constructor from .cpp to .h file;
* corrected name attribute in panel_generic_tip.xml;

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

--HG--
branch : product-engine
2010-04-19 17:21:16 +03:00
Brad Payne (Vir Linden) c5e338f240 merge 2010-04-19 10:13:49 -04:00
Brad Payne (Vir Linden) 695e4bc171 For EXT-6809 - search static VFS for all asset types 2010-04-19 10:00:06 -04:00
Tofu Linden 532d732645 merge from viewer-hotfix 2010-04-19 14:22:05 +01:00
Mike Antipov eddb964e70 Fixed windows EOLs.
--HG--
branch : product-engine
2010-04-19 16:20:11 +03:00
Vadim Savchuk d78984145e merge
--HG--
branch : product-engine
2010-04-19 16:17:50 +03:00
Vadim Savchuk 0756770e79 Merge from default branch
--HG--
branch : product-engine
2010-04-19 16:17:18 +03:00
Mike Antipov a94ec45cb1 Fixed normal bug EXT-6896 (String changes to default help text in Friends, Nearby and Recent lists)
* Updated default help text in Friends, Nearby and Recent lists according to requirements in the ticket.

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

--HG--
branch : product-engine
2010-04-19 16:06:23 +03:00
Mike Antipov a16195fb81 Fixed normal bug EXT-6864 (Resident-related menu items are enabled/displayed for PSTN bridge callers)
* Disabled all currently processed menu items related to interaction with a resident for Avaline callers.
* Added enable callback for View Profile menu item to disable it for Avaline callers.
* Disabled menu items related to text chat.
Full list is:
 - View Profile
 - Add Friend
 - IM
 - Call
 - Share
 - Pay
 - Block Text
 - Moderate Options:
  -- Allow Text chat

DEV notes: To process moderation options separate "on_enable handler" was created for group moderate actions.

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

--HG--
branch : product-engine
2010-04-19 15:50:45 +03:00
Tofu Linden 2336188eed merge from PE's viewer-hotfix 2010-04-19 13:36:54 +01:00
Tofu Linden fbc2064962 merge from PE's viewer-trunk 2010-04-19 13:35:55 +01:00
Tofu Linden 80ebd31ac4 trivial comment fix. 2010-04-19 13:08:33 +01:00
Tofu Linden 7462911bdd Change Linux fasttimer implementation back to RDTSC - using a reliable syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly.
But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway.

Also change many instances of Mhz to MHz.
Also some minor comment fixes.
2010-04-19 12:49:15 +01:00
Mike Antipov 59d296e200 Fixed major bug EXT-6682 (Emptying Lost & Found Folder can crash Viewer2.0 if recent item was added)
Reason: a pointer to renamed item was not nullified in Folder View when rename control lost focus.

Fix: updated focus lost callback to nullify the pointer to renamed item. Had to made this callback non-static to have access to Folder View's member pointer.

Also made "New..." menu items disabled for Lost & Found folder.

Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/251/

--HG--
branch : product-engine
2010-04-19 14:12:42 +03:00
Eugene Mutavchi ea6a3e8e78 Updated the reverted fix for critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up from an object), also integrated the fix for EXT-6786 ('Stand' button is corrupted if movement control floater is opened). Added some clarifying comments.
Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/.

--HG--
branch : product-engine
2010-04-19 13:32:07 +03:00
Igor Borovkov 71c7b2f6d7 completed EXT-6764 Implement filtering of wearables (combobox options: Clothes/Body, Objects, All) on Add to Outfit subpanel
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/221/

--HG--
branch : product-engine
2010-04-19 13:23:24 +03:00
Dmitry Zaporozhan b42efcfee3 Update for major task EXT-6564 - Fix wearable editing panels.
Added temporary "edit" button to outfit list to allow QA test new wearable edit panels.
Was not reviewed.

--HG--
branch : product-engine
2010-04-19 13:00:12 +03:00
Tofu Linden 3f10caafc0 merge from viewer-hotfix 2010-04-17 12:13:59 +01:00