Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Xiaohong Bao 202f16cdf8 trival: remove some redundant code from llviewertexture.cpp. 2010-04-19 16:35:38 -06:00
Eli Linden 5f80e5681c Merge 2010-04-19 12:53:59 -07:00
Roxie Linden 6823879c1a CR Changes from Aimee 2010-04-19 12:52:43 -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
Aimee Linden d6549677fb Removed left over initialization to 0 of mVoiceFontID from when it was an integer rather than a UUID. 2010-04-19 15:38:17 +01:00
Aimee Linden dad1c52ed1 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-19 15:31:52 +01: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
Aimee Linden e9b613e8d4 Identify fonts with UUIDs rather than using the font indexes directly as they are not guaranteed unique across sessions.
Replaced all references to "Font" with "Voice Font" where possible to reduce confusion for anyone grepping code in future.
2010-04-19 15:16:48 +01: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
Tofu Linden 7d349bfde3 merge from PE's viewer-hotfix 2010-04-17 12:03:36 +01:00
Tofu Linden 06884cf137 merge from PE's viewer-trunk 2010-04-17 12:02:54 +01:00
Leyla Farazha 663d8f7870 Merge 2010-04-16 14:51:15 -07:00
Leyla Farazha ba057d34cd Fixed prim controls mute bug
Reviewed by Richard CC#204
2010-04-16 14:48:06 -07:00
Richard Linden 8cb7af4f73 removed tabs from cmakelist.txt 2010-04-16 14:48:05 -07:00
Leyla Farazha 652d18e6c4 Adding volume controls in NMP
reivewed by RIchard cc#194
2010-04-16 14:18:21 -07:00
Leyla Farazha 748de83a63 EXT-5205 MoAP auto zoom should not work on prims attached as HUDs
Reviewed by Richard CC#192
2010-04-16 14:17:15 -07:00
Leyla Farazha 211b7f600e EXT-1998 [BSI] Hover text on HUD attachments is offset toward the right
Reviewed by Richard CC#193
2010-04-16 14:16:49 -07:00
Brad Payne (Vir Linden) 3b8ce1d18a For EXT-6809 - search static VFS for all asset types 2010-04-16 17:13:11 -04:00
Brad Payne (Vir Linden) 142f867d38 For EXT-6809 - search static VFS for all asset types 2010-04-16 16:06:34 -04:00
Richard Linden e6daa50c58 windows_volume_catcher.cpp, now with comments!
also added volume_catcher.h to project
2010-04-16 12:10:57 -07:00
Eli Linden a1a43f7942 Merge 2010-04-16 10:40:50 -07:00
Eli Linden 020a1b5b8a ES linguistic 2010-04-16 10:40:19 -07:00
Richard Linden 882436ba06 merge 2010-04-16 10:29:07 -07:00
Loren Shih 35168862f5 EXT-6892 : Add debug setting to show avatar rez times
This pops up a notification whenever another avatar rezzes.  Controlled by a #define, currently set to ON.
2010-04-16 12:28:54 -04:00
Eugene Mutavchi d69084d5d8 Reverted fix of EXT-1655 (because it causes EXT-6835)
--HG--
branch : product-engine
2010-04-16 19:28:37 +03:00
Dmitry Zaporozhan df65685f73 Fixed EXT-6790(major) - Limit to amount of text output to script error/warning window is to limited.
Could not find history for floater_script_debug_panel.xml. Looks like current max_length="10000" was randomly picked as a reasonable value at some point of viewer-2-0 development.
Using viewer-1-23 value for max_length - "2147483647"

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

--HG--
branch : product-engine
2010-04-16 17:27:45 +03:00
Paul Guslisty 9d85f4ebe9 Fixed normal EXT-6812 ([TRUNCATION] APARIENCIA window > Forma > Boca > Labios: prominec. \"Labios: prominenc\" should be \"Labios: prominencia\".)
- There was two reasons:
1. Uninitialized variable in llsliderctrl.(h/cpp) that contains label size. This variable take part in calculation of TextBox size of label.
2. Font of 'label string' and text box was different. This causes wrong calculation of 'label string' length.

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

--HG--
branch : product-engine
2010-04-16 17:24:50 +03:00