Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden 1cee577ca0 Oops! I fixed these compile errors but didn't commit them. 2010-05-12 11:42:53 +01:00
Tofu Linden 7059173aa9 merge from PE's viewer-trunk 2010-05-12 10:55:19 +01:00
Alexei Arabadji 9ab4d2ca8b EXT-7120 FIXED Added confirmation about leaving group, ad-hoc and p2p call.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/374/

--HG--
branch : product-engine
2010-05-12 11:11:02 +03:00
Aimee Linden 8aac434802 EXT-7138 WIP Added temporary debug setting "VoiceFontsAvailable", to test UI when no voice fonts are available. 2010-05-12 02:26:43 +01:00
Aimee Linden 270da3e141 EXT-7138 WIP Allow selection of no voice font when none are available. 2010-05-12 02:24:46 +01:00
Eli Linden 489a5eb9e2 Merge 2010-05-11 18:17:43 -07:00
Eli Linden 188d0dd874 EXT-7299 FIX FR punctuation 2010-05-11 18:16:48 -07:00
Aimee Linden ba921a37fe EXT-7138 WIP Enumerate template voice fonts.
Also simplified LLPanelVoiceFont some.
2010-05-12 01:54:46 +01:00
Richard Linden 709dd3f862 merge 2010-05-11 17:48:04 -07:00
Richard Linden eb1bf97b1e EXT-1998 - [BSI] Hover text on HUD attachments is offset toward the right 2010-05-11 17:44:58 -07:00
Eli Linden 45dcce5fdc Merge 2010-05-11 17:21:29 -07:00
Eli Linden 42b9c4644d VWR-19257 fix DE remove old parameters 2010-05-11 17:20:44 -07:00
Mark Palange (Mani) 0db04cbb67 EXT-3780 WIP Adding newline to linux getCPUFeatureDesc output 2010-05-11 16:27:50 -07:00
Loren Shih cec79c7ae1 automated merge 2010-05-11 17:44:20 -04:00
Loren Shih 35bf78478c EXT-7306 : FIXED : Add shortcut-style icons for inventory links
EXT-7312 : FIXED : INFRASTRUCTURE : Cleanup LLPanelObjectInventory

Fixed a few minor bugs with LLInventoryIcon being called with incorrect arguments.
Big cleanup of LLPanelobjectInventory to make better use of inheritance.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11 17:43:00 -04:00
Eli Linden 0ebf74a229 Merge 2010-05-11 14:37:25 -07:00
Eli Linden ae2821458c EXT-7125 FIX IT ES PT missing translations 2010-05-11 14:35:47 -07:00
Richard Linden 889fa5e55d converted media volume falloff to proper 1/x^2 function
reviewed by leyla
2010-05-11 13:59:55 -07:00
Vadim Savchuk b24dfb72c5 EXT-7206 FIXED Shape editing panel: implemented displaying avatar height in meters.
Changes:
- Now displaying (continuously refreshed) avatar height in the shape editing panel.
- Updated avatar avatar sex switching radio buttons according to the spec (icons, size, position).
- Fixed position, text and font color of the "Shape:" label.

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

--HG--
branch : product-engine
2010-05-11 23:04:43 +03:00
Loren Shih 37dc96ccdd automated merge 2010-05-11 15:46:48 -04:00
Loren Shih 4c03806be9 EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Fixed mac compile error.
2010-05-11 15:42:06 -04:00
Roxie Linden 215ae1ed5d 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-05-11 12:39:40 -07:00
Roxie Linden c16110595b automated merge and fix build break on snow leopard (it's a warning on leopard on parabuild) 2010-05-11 12:32:53 -07:00
Loren Shih d8b96c686d automated merge 2010-05-11 15:25:52 -04:00
Roxie Linden ef021ddc9a Automated merge 2010-05-11 12:24:28 -07:00
Loren Shih bf8ee42813 EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Name change LLWearableDictionary.h to LLWearableType.h.
2010-05-11 15:24:27 -04:00
Eli Linden 8511dbca1f ND-46735 WIP JA linguistic 2010-05-11 12:16:48 -07:00
Loren Shih adc0aba2dd EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design.  This required a lot of superficial changes across many files.  Overall functionality has not changed.
2010-05-11 15:08:29 -04:00
Palmer 2889912809 First part of EXT-7309, just turning on impostors again for 945 and 965. No code changed 2010-05-11 11:46:52 -07:00
Roxie Linden cd7ca56352 automated merge 2010-05-11 10:39:46 -07:00
Loren Shih 5490d4f566 automated merge 2010-05-11 13:02:43 -04:00
Loren Shih 64da5083d0 EXT-7306 : FIXED : Add shortcut-style icons for inventory links
EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code

Inventory link icons were designed from scratch.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11 13:01:27 -04:00
Vadim Savchuk 1ec883e456 EXT-6686 FIXED Added PARCEL_DETAILS_ID to the list of highlightable keywords in script editor.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/365/

--HG--
branch : product-engine
2010-05-11 18:19:53 +03:00
Roxie Linden ea7f8da645 Automated merge 2010-05-11 03:22:35 -07:00
Tofu Linden ee1bede01d merge from PE's viewer-trunk 2010-05-11 10:42:38 +01:00
Andrew Polunin b46ba199ff EXT-7075 FIXED Map button now is always enabled and shows current user location if no other item is selected
- Added new pure virtual member function isSingleItemSelected() to the LLPanelPlacesTab. It is used in the LLPanelPlaces class inside onShowOnMapButtonClicked() to check if something was selected on the active panel. If so then selection is shown on the world map. Otherwise current agent position is shown on the world map.
- Implemented isSingleItemSelected() in the both LLPanelPlacesTab derived classes: LLLandmarksPanel and LLTeleportHistoryPanel
- Removed functionality which disables Map button if no selection is made

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

--HG--
branch : product-engine
2010-05-11 11:34:36 +03:00
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07:00
Xiaohong Bao 24f54d1dff Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-10 16:22:16 -06:00
Xiaohong Bao 6eb0d854b8 EXT-7294: FIXED: crash at LLTextureCache::updateEntry [secondlife-bin lltexturecache.cpp:1231]
Also simply the writing flow of the texture cache.
2010-05-10 16:21:15 -06:00
Eli Linden a87489046f ND-46735 WIP IT and PT linguistic 2010-05-10 11:08:13 -07:00
Loren Shih 79457a85fe EXT-7293 : Make link items easier to distinguish from regular items
Link items now appear in light gray.
2010-05-10 13:59:57 -04:00
Aimee Linden 1cb1e3d16f Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-10 12:51:40 +01:00
Mike Antipov 9027f4430d EXT-7095 FIXED Replaced voice moderation menu items and updated related actions.
* Replaced "Un/Mute everyone else" menu items with requested ones. They are enabled only on participants in Voice session (are shown for moderators)
* Actions implemented via existent "Un/Mute everyone else" functionality where "else" is NULL item.

Known issues:
 * It is impossible to perform the same "Un/Mute everyone" action is session is already in requested state:  EXT-6937
 * If voice is disabled in a group session not all muted participants have appropriate indicator in VCP if resident joins to the session.
    Due to this is the same behavior as before current patch is provided, a separate EXT-7235 bug is filed for this.

--HG--
branch : product-engine
2010-05-10 10:45:43 +03:00
Tofu Linden 8e1dbbbb56 merge from PE's viewer-trunk 2010-05-08 13:16:29 +01:00
Eli Linden 7108c9e07a EXT-7111 FIX missing translation for 5 langs 2010-05-07 16:25:07 -07:00
Eli Linden 5a62377416 Merge 2010-05-07 15:53:26 -07:00
Eli Linden 09ce956b74 ND-46735 WIP PT linguistic 2010-05-07 15:52:34 -07:00
Eli Linden c699f6b0d3 EXT-6844 FIX Shorten ES strings to alleviate UI truncation 2010-05-07 15:51:58 -07:00
Loren Shih 4938d23e75 automated merge 2010-05-07 16:39:42 -04:00
Loren Shih f28887554e EXT-7276: Hide "paste as link" under Debug Setting ("InventoryLinking")
In viewer2.0, paste as link was only allowed in god mode.  Here, it is allowable if the user sets a debug setting.  This prevents normal users from accidentally screwing up their inventory if they don't understand what a link is.
2010-05-07 16:33:18 -04:00