Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Aimee Linden 4f38dd2682 DEV-49390 (SNOW-573): Deprecated methods for getting and setting the system audio mute on Mac
AudioHardwareGetProperty(), AudioDeviceGetProperty() and AudioDeviceSetProperty() were deprecated in the 10.5 SDK, replaced using AudioObjectGetPropertyData() and AudioObjectSetPropertyData().
2010-04-25 12:42:10 +01:00
Aimee Linden 0cdaca2b46 DEV-49389 (SNOW-571 / VWR-18279): Replacing another deprecated WaitNextEvent() for the OS X 10.6 SDK
Replaced the deprecated WaitNextEvent() call with ReceiveNextEvent() and SendEventToEventTarget() as a basic event loop in slplugin.cpp
2010-04-25 03:49:55 +01:00
Aimee Linden f758852266 DEV-42251 (SNOW-570 / SNOW-220 / VWR-14711): WaitNextEvent() is deprecated in the OS X 10.6 SDK
Imported from Snowglobe.
Use RunApplicationEventLoop() instead of WaitNextEvent() while the viewer is waiting for the crash logger to exit.
2010-04-25 00:41:41 +01:00
Aimee Linden 5fa00a67af DEV-39786 (SNOW-572 / SNOW-220 / VWR-14712): GL_COLOR_INDEX8_EXT not defined as GL_EXT_paletted_texture is deprecated.
Imported from Snowglobe.
2010-04-24 20:36:42 +01:00
Aimee Linden f35a2112ea EXT-7055: Re-remove old MAP_SCALE_* constants removed in DEV-30614 that have snuck back in 2010-04-24 18:55:55 +01:00
Aimee Linden 0439690efd Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-24 14:51:14 +01:00
Aimee Linden c99904585b EXT-7005 : Kill unhelpful 'Deprecated conversion from string to char *' warnings from fmod_errors.h when building with GCC >=4.2 on Darwin
Apply -Wno-write-strings compile flag to llaudioengine_fmod.cpp and llstreamingaudio_fmod.cpp on Darwin as it was on Linux (Amen).
Removed unnecessary check for GCC >= 4.2 when applying this flag, as CXX_VERSION_NUMBER it used is only being generated in 00-Common.cmake on Linux at the moment and 4.0 understands -Wno-write-strings anyway.
2010-04-24 14:50:33 +01:00
Monroe Linden 57a2a2beff Add a way for plugins to send a message and block waiting for the response
This requires some cooperation between the plugin and the host, and will only work for specific messages.

The way it works is as follows:
* the plugin sends a message containing the key "blocking_request" (with any value)
* this will cause the "send message" function to block (continuing to pull incoming messages off the network socket and queue them) until it receives a message from the host containing the key "blocking_response"
** NOTE: if the plugin sends a blocking_request that isn't set up to cause the host to send back a blocking_response, it will block forever
* the blocking_response message will be handed to the plugin's "receive message" function _immediately_ (before the "send message" function returns)
** this means that the plugin can extract response data for use by the the code that sent the message (but is still blocked inside the "send message" call)
** NOTE: this BREAKS the invariant stating that the plugin's "receive message" function will never be called recursively, and the plugin MUST be prepared to deal with this
* after the plugin finishes processing the blocking_response message, the "send message" function that was called with the blocking_request message will return to the plugin
* any queued messages will be delivered after the outer invocation of the plugin's "receive message" function returns (as normal)

Inside the viewer, the code can tell when a plugin is in this blocked state by calling LLPluginProcessParent::isBlocked().  LLPluginClassMedia uses this to avoid sending mouse-move and size-change messages to blocked plugins.
2010-04-23 15:50:22 -07:00
Tofu Linden 13bf599e08 merge from PE's viewer-trunk 2010-04-28 21:05:21 +01:00
Loren Shih ec36c092a2 Compile error fix for missing description field in link_inventory_item. 2010-04-28 14:14:06 -04:00
Loren Shih 29e1804139 automated merge 2010-04-28 13:37:21 -04:00
Loren Shih 26d324a2dd DEV-49349 : AIS hides broken inventory links after a relog
inventory_and_asset_types_match is always true for links (i.e. links should not have to be a certain inventory type).
2010-04-27 18:39:09 -04:00
Loren Shih aa7b3312c2 Small XML fix for Inventory Floater, which was obscuring the text showing the number of items fetched. 2010-04-27 17:20:35 -04:00
Loren Shih c495e7f42a EXT-7109 : Ensure "Open" works for all types, change to "Open Original" for links
Added new "Open Original" menu item for links, to clarify that you're opening the item the link is pointing to.
2010-04-27 14:03:42 -04:00
Loren Shih 5f104c1cb5 EXT-7076 : Allow "paste as link" for any item
Changed llassettype dictionary table to enable linking to most item types.
2010-04-27 14:02:49 -04:00
Loren Shih ed21ab1546 EXT-7108 Creating link to openable item should not open the item (e.g. notecard)
When you create a link to a notecard, you'll no longer open the notecard.
2010-04-27 14:02:10 -04:00
Loren Shih 404fe5b525 EXT-7076 : Allow "paste as link" for any item
EXT-7077 : Enable paste as link for folders

Took out code that was stopping paste for god-mode only.  Now everyone can do it.
Corrected a bool logic error for protected folder restrictions.
2010-04-26 16:43:02 -04:00
Roxie Linden a42dcc3f5e automated merge 2010-04-23 13:24:09 -07:00
Eli Linden c48e747806 FR linguistic 2010-04-23 13:04:42 -07:00
Brad Payne (Vir Linden) 063a7a531a Improved default animations - work in progress 2010-04-23 16:00:12 -04:00
Roxie Linden e1b3919a4f DEV-49362 - SLE: Generic passing of settings up from the server allows attacker to overwrite saved settings when user logs into some other non secondlife grid.
We now do it the old-skool way, simply checking if the specific values exist
2010-04-23 12:15:22 -07:00
Eugene Mutavchi d0204a2b14 Related to normal bug EXT-6302 (TP requests need to display destination region maturity) - added displaying maturity rating with an icon.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/229/.

--HG--
branch : product-engine
2010-04-23 21:52:18 +03:00
Andrew Dyukov c540ef450a Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification is shown while connecting to ad-hoc voice chat).
Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names.

- First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible.

- Second was solved by placing "Leaving..." textbox lower

Reviewed by Vadim Sachuk at https://codereview.productengine.com/secondlife/r/310/

--HG--
branch : product-engine
2010-04-23 21:40:41 +03:00
Alexei Arabadji 4f02217d9d fixed EXT-6891 Region name SLurl is absent ot teleport offer toast if long message was added
Decreased limit of teleport offer text invitaton to 178 characters(254 - max_location_url_length(76))

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/302/

--HG--
branch : product-engine
2010-04-23 19:50:01 +03:00
Mike Antipov 5dfc5d020c Work on task EXT-6722 (Create modified inventory view for "my outfits" tab in top-level appearance sidebar)
Code improvements:
 * Moved Accordion tab + Flat list into separate xml.
 * Implemented dynamic creation of the accordion tab via xml

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

--HG--
branch : product-engine
2010-04-23 17:44:33 +03:00
Vadim Savchuk 07b463722e Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).
Reason: Attempt to purge empty teleport history resulted in inconsistent history state.
There were two consequences:
1) Further teleports would not properly update the history.
2) Subscribers of history changes were notified of the invalid change and that led to the crash.

My changes:
- added a sanity check to LLTeleportHistoryStorage::onTeleportHistoryChange() to prevent the crash
- purging empty teleport history now does nothing, hence the history doesn't become inconsistent
- removed a redundant (but harmless) call to onTeleportHistoryChanged() from LLNavigationBar::draw() because it's called by LLTeleportHistory::purgeItems() anyway

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

--HG--
branch : product-engine
2010-04-23 17:18:37 +03:00
Igor Borovkov 1186e6dd74 merge
--HG--
branch : product-engine
2010-04-23 16:28:35 +03:00
Igor Borovkov 72c7323df7 merge
--HG--
branch : product-engine
2010-04-23 15:58:28 +03:00
Igor Borovkov f0f9ab5aa6 fixed linux build
no review, no jira issue

--HG--
branch : product-engine
2010-04-23 15:57:44 +03:00
Yuri Chebotarev 6113dab230 merge
--HG--
branch : product-engine
2010-04-23 15:51:07 +03:00
Yuri Chebotarev 92450263ec fix for EXT-6999 Group creation panel: pop-up menu for empty group title editfield has 'Delete' item enabled
reviewed Mike Antipov
https://codereview.productengine.com/secondlife/r/307/

--HG--
branch : product-engine
2010-04-23 15:50:20 +03:00
Yuri Chebotarev 583e1951bf EXT-6970 Title of attachment from previously viewed group can be found in current group while viewing notices
reviewed Mike Antipov
https://codereview.productengine.com/secondlife/r/306/

--HG--
branch : product-engine
2010-04-23 15:48:58 +03:00
Yuri Chebotarev aab5982160 fix EXT-6766 The number of characters allowed in the Chat Edit Window in Vewer 2 is 1/2 that in Vewer 1
reviewed Mike Antipov
https://codereview.productengine.com/secondlife/r/305/

--HG--
branch : product-engine
2010-04-23 15:46:20 +03:00
Yuri Chebotarev e41912d336 fix for EXT-5839 Creating a new wearable in a localized viewer attempts to use non-ascii characters for inventory types in some languages
reviewed Richard Nelson
https://codereview.productengine.com/secondlife/r/61/

--HG--
branch : product-engine
2010-04-23 15:44:15 +03:00
Vadim Savchuk efd7b2502d merge
--HG--
branch : product-engine
2010-04-23 15:41:15 +03:00
Vadim Savchuk d24a134df9 Manual merge from default branch.
Semi-automatically resolved conflicts in:
* BuildParams
* indra/newview/CMakeLists.txt
* indra/newview/llviewermessage.cpp

--HG--
branch : product-engine
2010-04-23 15:40:02 +03:00
Igor Borovkov 5405bf10cd merge
--HG--
branch : product-engine
2010-04-23 14:45:27 +03:00
Igor Borovkov 181315db32 completed EXT-6721 (Enable UI for user modification of wearable order)
- added functionality to change order of wearables
- added ad-hoc up and down buttons on a button bar ("up" means closer to the body) - https://jira.secondlife.com/secure/attachment/38464/screenshot-1.jpg
- added displaying wearables as sorted by order on the Edit Outfit panel (top list)

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/

--HG--
branch : product-engine
2010-04-23 14:35:24 +03:00
Eugene Mutavchi 0225b5354b Related to EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up from an object) - disabled forcing of flying at autopilot stops (for "Sit" autopilot behavior).
Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/

--HG--
branch : product-engine
2010-04-23 14:21:43 +03:00
Tofu Linden e82ed4e876 merge 2010-04-23 10:52:29 +01:00
Tofu Linden a30e6f0ad0 Backed out changeset 4627863f43d5
back-out this backout.  change made in viewer-trunk, reverted in viewer-hotfix, but we want it preserved post-merge.
2010-04-23 10:50:20 +01:00
Tofu Linden e6df0206a8 merge from viewer-hotfix 2010-04-23 10:48:54 +01:00
Tofu Linden 4bec811062 merge from PE's viewer-trunk 2010-04-23 10:44:45 +01:00
Tofu Linden b99c90daf3 merge 2010-04-23 10:42:35 +01:00
Paul Guslisty bb908fb73e Fixed normal bug EXT-6729 ([TRUNCATION] SELECTOR DE COLOR. \"(arrástralo abajo para g\" should be \"(arrástralo abajo para guardarlo)\" or...)
- Deleted overriden dimensions in FR locale

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

--HG--
branch : product-engine
2010-04-23 08:12:00 +03:00
Paul Guslisty 720a50daed Fixed normal EXT-6927 (Vertical tabs not attached to tab panel)
- Decreased space between tabs and panel in tab container

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

--HG--
branch : product-engine
2010-04-23 08:09:34 +03:00
Paul Guslisty 2b59f37d4b Fixed normal bug EXT-6904 (Edit Appearence panel has UI corrupted in IT)
- Main changes:
    - Increased floater, tabcontainer, scrollcontainer and 'Revert' button width
    - Made layout of Item Action Label and 'Save', 'Save As', 'Revert' buttons equally for all panels

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

--HG--
branch : product-engine
2010-04-23 08:04:29 +03:00
Paul Guslisty c5aa11e04f Fixed normal EXT-6845 ([TRUNCATION] Media Control. \"Parar tod\" - \"Iniciar to\")
- Increased buttons width and panel width

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

--HG--
branch : product-engine
2010-04-23 07:58:04 +03:00
Paul Guslisty dd0b023583 Fixed normal EXT-6841 ([TRUNCATION] Sidebar > People. Choose and show a group > Land/ Assets. \"No tienes permiso para ver el terreno propiedad del g\")
-Applied ward wrap for comments in scroll list

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

--HG--
branch : product-engine
2010-04-23 07:53:56 +03:00
Paul Guslisty 9166e7a8a0 Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window appears in EN)
- Added instead of hardcoded string two strings to the strings.xml

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

--HG--
branch : product-engine
2010-04-23 07:46:34 +03:00