Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Vadim Savchuk 4a997e9627 Merge from default branch
--HG--
branch : product-engine
2010-04-06 17:17:33 +03:00
Andrew Dyukov b658e4115d Fixed normal bug EXT-6464 (Buy pass from popup menu doesn't work).
- The bug was caused by deselection of parcel(because of zero ref count to parcel selection) after appearance of alert with ok/cancel.
Added setting pointer to this selection before notification appearance and nullifying pointer it after user chooses ok or cancel. Nullifying
will always take place because alert is modal, so there is no chance that LLPanelLandGeneral::cbBuyPass() won't be called.

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

--HG--
branch : product-engine
2010-04-06 16:02:14 +03:00
Yuri Chebotarev 3da3ed2ccb merge
--HG--
branch : product-engine
2010-04-06 11:54:32 +03:00
Leyla Farazha a0a7b7ed16 Merge 2010-04-05 15:12:12 -07:00
Eli Linden 8928296b3c Merge 2010-04-05 14:16:45 -07:00
Eli Linden 0049115e5d ES fix unlocalized sidepanel titles 2010-04-05 14:15:08 -07:00
Loren Shih 7bfa3e81e7 EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Superficial header file cleanup.

Change made to simulator files as well.
2010-04-05 16:18:19 -04:00
Loren Shih b49165a9dd EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Superficial header file cleanup for LLInventoryFunctions.

Change made to simulator files as well.
2010-04-05 16:16:13 -04:00
Loren Shih d13dac1550 EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Superficial header file cleanup.

Change made to simulator files as well.
2010-04-05 16:13:02 -04:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
Loren Shih 9bfc1c3b10 automated merge 2010-04-05 10:34:36 -04:00
Kent Quirk 99a24d7fb8 merge hotfix changes to release 2010-04-02 23:47:19 -04:00
Leyla Farazha 6b3ca581e0 EXT-5921 Inspector icon in nearby chat/IM doesn't match other inspector icons 2010-04-02 15:45:58 -07:00
Monroe Linden 3d0f02054e Updated Mac build of LLQtWebKit library.
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-02 15:09:38 -07:00
Callum Prentice 98e46e28e0 Merge with tip 2010-04-02 14:57:12 -07:00
Callum Prentice 9e1b600d9b DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows) 2010-04-02 14:27:13 -07:00
Loren Shih 9007cf3a53 EXT-6696 : Make Library inventory items somehow distinguishable at first glance from My Inventory items
Library items are now set to Emphasis Color.  This can be easily changed.
Also fixed an issue where the "(Loading...)" string was overlapping with folder inventory strings.
2010-04-02 17:12:13 -04:00
Eli Linden 8adb47c784 EXT-6690 shorten PL translation 2010-04-02 14:11:37 -07:00
Callum Prentice da6bba2ed3 DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows) 2010-04-02 14:10:54 -07:00
Tofu Linden 20c660569d merge 2010-04-02 21:49:45 +01:00
Monroe Linden e7b7dc36f7 Updated Mac build of LLQtWebKit library.
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-02 13:49:35 -07:00
Monroe Linden 50b97bfaf5 Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is questionable)
* remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer.
* replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive
* don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in)

Reviewed by Richard at http://codereview.lindenlab.com/1218007
2010-04-02 13:30:14 -07:00
Eli Linden 3e1d33135d VWR-17709 en_xui_change to accommodate the longest translation in PL even though this is a bug reported for ES; undo JA old override 2010-04-02 12:40:44 -07:00
Loren Shih 568d6ed229 EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'s
Fixed some more typedefs that I missed in first checkin.
2010-04-02 15:19:44 -04:00
Loren Shih 2c5c563319 automated merge 2010-04-02 13:20:39 -04:00
Loren Shih fd04b26d34 automated merge 2010-04-02 13:14:12 -04:00
Brad Payne (Vir Linden) 73827e8430 merge 2010-04-02 13:10:54 -04:00
Eugene Mutavchi cf94709c60 Fixed normal bug EXT-6348 (SLapp world map location does not display the correct region) - fixed displaying the world map location for escaped SLapp urls.
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/173/.

--HG--
branch : product-engine
2010-04-02 19:53:19 +03:00
Brad Payne (Vir Linden) 5faa2444f9 merge 2010-04-02 12:51:39 -04:00
Eugene Mutavchi 1cd9f71ed1 Fixed normal bug EXT-6673 (Default sort order of Nerby People list should be by most recent speaker) - corrected the default setting for nearby people sort order.
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/175/.

--HG--
branch : product-engine
2010-04-02 19:51:21 +03:00
Xiaohong Bao 36987904d4 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-02 10:40:48 -06:00
Xiaohong Bao 8cd95bd12a add some debug code for EXT-5394: Crash in LLViewerMediaImpl::calculateInterest() 2010-04-02 10:33:20 -06:00
Loren Shih 873de2daae automated merge 2010-04-02 12:32:56 -04:00
Eugene Mutavchi d7579203c0 Partial fix for reopened EXT-6357 (SLapp for object chat does display an inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace.
Reviewed by Vadim Savchuk.

--HG--
branch : product-engine
2010-04-02 19:27:27 +03:00
Loren Shih 580ecaefca EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:56:52 -04:00
Loren Shih 825e4df30d EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:12:59 -04:00
Eugene Mutavchi 520ff658c9 No ticket. Fixed Linux build.
--HG--
branch : product-engine
2010-04-02 18:11:42 +03:00
Mike Antipov ae910114f0 Completed normal task EXT-6646 ([TRUNCATION] Volume bar truncated.)
The reason: overridden width attributes in localized files.

Fix: remove overrides in 'es', 'fr', 'it', 'pt' locales.
 But override tab width for 'it' locale to accommodate "Mute when minimized" checkbox on Sound & Media panel.

NOTE: there is no enough room for "Mute when minimized" checkbox on Sound & Media panel in 'nl' locale.
 It requires too much space, about 117 extra px and issue should be moved into separate ticket.

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

--HG--
branch : product-engine
2010-04-02 17:56:35 +03:00
Igor Borovkov 16b22d4abe merge
--HG--
branch : product-engine
2010-04-02 17:24:44 +03:00
Igor Borovkov f4f05ad4df merge
--HG--
branch : product-engine
2010-04-02 17:20:19 +03:00
Vadim Savchuk 7d38dd51c2 Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine
2010-04-02 17:18:36 +03:00
Brad Payne (Vir Linden) a3ba5836f0 Cleanup 2010-04-02 09:54:29 -04:00
Vadim Savchuk f6b48339d9 Fixed major bug EXT-6595 (World->Place Profile flyout menu doesn't include link to side panel place info).
Added a new main menu item: World -> Place Profile -> Place Profile.
I'm not sure about its label though (double "Place Profile").

Reviewed by Sam: https://codereview.productengine.com/secondlife/r/161/

--HG--
branch : product-engine
2010-04-02 15:49:13 +03:00
Tofu Linden e46f128d20 PE merge 2010-04-02 12:35:24 +01:00
Igor Borovkov 43d756a7dc done EXT-6674 Switch Edit Outfit panel (list at the top) to show content of the Current Outfit system folder
reviewed at https://codereview.productengine.com/secondlife/r/159/

--HG--
branch : product-engine
2010-04-02 13:58:16 +03:00
Eugene Mutavchi 32283a93e0 Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) - added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater.
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/

--HG--
branch : product-engine
2010-04-02 13:36:58 +03:00
Eugene Mutavchi 81582cb376 Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat history) - added new 'ChatTimestampColor' color setting, which is set to timestamps for chat history messages in text mode which are not from log.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/160/.

--HG--
branch : product-engine
2010-04-02 13:15:50 +03:00
Roxie Linden a7085418df Automated merge 2010-04-02 02:06:04 -07:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00