809b6879e1
Use 10.5 sdk
2010-04-26 17:35:52 -05:00
35af6385c6
merge
2010-04-26 11:56:44 -05:00
79f38a961d
Make LLPipeline::getVisiblePointCloud not a hot spot.
...
Reviewed by Palmer.
2010-04-26 11:55:48 -05:00
64112134be
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
2010-04-26 14:42:06 +01:00
438f0e372e
merge from viewer-trunk
2010-04-26 10:57:51 +01:00
a046736514
merge from PE's viewer-trunk
2010-04-26 10:25:35 +01:00
1993732a6c
final(?!) merge from viewer-hotfix.
2010-04-26 10:02:53 +01:00
ec5a9e26a0
merge from PE's viewer-hotfix
2010-04-26 09:50:06 +01:00
6a6af64e07
DEV-39789 (SNOW-627/SNOW-227/VWR-15454): Remove obsolete Apple FSCopyObject code from mac-updater
2010-04-26 02:19:57 +01:00
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
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
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
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
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
0439690efd
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-24 14:51:14 +01:00
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
c48e747806
FR linguistic
2010-04-23 13:04:42 -07:00
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
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
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
1a987e8d32
merge
2010-04-23 17:38:21 +01:00
f313196363
Backed out changeset 90f0ce75b2d7
2010-04-23 17:35:32 +01:00
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
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
1186e6dd74
merge
...
--HG--
branch : product-engine
2010-04-23 16:28:35 +03:00
72c7323df7
merge
...
--HG--
branch : product-engine
2010-04-23 15:58:28 +03:00
f0f9ab5aa6
fixed linux build
...
no review, no jira issue
--HG--
branch : product-engine
2010-04-23 15:57:44 +03:00
6113dab230
merge
...
--HG--
branch : product-engine
2010-04-23 15:51:07 +03:00
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
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
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
008873627d
merge from viewer-trunk
2010-04-23 13:44:49 +01:00
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
efd7b2502d
merge
...
--HG--
branch : product-engine
2010-04-23 15:41:15 +03:00
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
f972cc4be9
Restore a bit of the non-deferred renderer's sun/moon waterglow in deferred rendering. This also adds a slight pinch of glow to shiny sun-spots. So be it.
...
(transplanted from 5a0d9e5b5cfb2ecd96685f0275ab8e999ab86263)
2010-04-23 13:37:03 +01:00
5405bf10cd
merge
...
--HG--
branch : product-engine
2010-04-23 14:45:27 +03:00
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
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
e82ed4e876
merge
2010-04-23 10:52:29 +01:00
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
e6df0206a8
merge from viewer-hotfix
2010-04-23 10:48:54 +01:00
4bec811062
merge from PE's viewer-trunk
2010-04-23 10:44:45 +01:00
b99c90daf3
merge
2010-04-23 10:42:35 +01:00
95ca4315e3
Fix for stupid shader loading mistake.
2010-04-23 00:38:10 -05:00
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
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
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
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
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
Dave Parks
