summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-26final(?!) merge from viewer-hotfix.Tofu Linden
2010-04-26merge from PE's viewer-hotfixTofu Linden
2010-04-26DEV-39789 (SNOW-627/SNOW-227/VWR-15454): Remove obsolete Apple FSCopyObject ↵Aimee Linden
code from mac-updater
2010-04-25DEV-49390 (SNOW-573): Deprecated methods for getting and setting the system ↵Aimee Linden
audio mute on Mac AudioHardwareGetProperty(), AudioDeviceGetProperty() and AudioDeviceSetProperty() were deprecated in the 10.5 SDK, replaced using AudioObjectGetPropertyData() and AudioObjectSetPropertyData().
2010-04-25DEV-49389 (SNOW-571 / VWR-18279): Replacing another deprecated ↵Aimee Linden
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-25DEV-42251 (SNOW-570 / SNOW-220 / VWR-14711): WaitNextEvent() is deprecated ↵Aimee Linden
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-24DEV-39786 (SNOW-572 / SNOW-220 / VWR-14712): GL_COLOR_INDEX8_EXT not defined ↵Aimee Linden
as GL_EXT_paletted_texture is deprecated. Imported from Snowglobe.
2010-04-24EXT-7055: Re-remove old MAP_SCALE_* constants removed in DEV-30614 that have ↵Aimee Linden
snuck back in
2010-04-24Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkAimee Linden
2010-04-24EXT-7005 : Kill unhelpful 'Deprecated conversion from string to char *' ↵Aimee Linden
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-23FR linguisticEli Linden
2010-04-23Related to normal bug EXT-6302 (TP requests need to display destination ↵Eugene Mutavchi
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-23Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification ↵Andrew Dyukov
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-23fixed EXT-6891 Region name SLurl is absent ot teleport offer toast if long ↵Alexei Arabadji
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-23Work on task EXT-6722 (Create modified inventory view for "my outfits" tab ↵Mike Antipov
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-23Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).Vadim Savchuk
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-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23fixed linux buildIgor Borovkov
no review, no jira issue --HG-- branch : product-engine
2010-04-23mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-23fix for EXT-6999 Group creation panel: pop-up menu for empty group title ↵Yuri Chebotarev
editfield has 'Delete' item enabled reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/307/ --HG-- branch : product-engine
2010-04-23EXT-6970 Title of attachment from previously viewed group can be found in ↵Yuri Chebotarev
current group while viewing notices reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/306/ --HG-- branch : product-engine
2010-04-23fix EXT-6766 The number of characters allowed in the Chat Edit Window in ↵Yuri Chebotarev
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-23fix for EXT-5839 Creating a new wearable in a localized viewer attempts to ↵Yuri Chebotarev
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-23mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-23Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * BuildParams * indra/newview/CMakeLists.txt * indra/newview/llviewermessage.cpp --HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23completed EXT-6721 (Enable UI for user modification of wearable order)Igor Borovkov
- 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-23Related to EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up ↵Eugene Mutavchi
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-23merge from viewer-hotfixTofu Linden
2010-04-23merge from PE's viewer-trunkTofu Linden
2010-04-23mergeTofu Linden
2010-04-23Fixed normal bug EXT-6729 ([TRUNCATION] SELECTOR DE COLOR. \"(arrástralo ↵Paul Guslisty
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-23Fixed normal EXT-6927 (Vertical tabs not attached to tab panel)Paul Guslisty
- 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-23Fixed normal bug EXT-6904 (Edit Appearence panel has UI corrupted in IT)Paul Guslisty
- 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-23Fixed normal EXT-6845 ([TRUNCATION] Media Control. \"Parar tod\" - \"Iniciar ↵Paul Guslisty
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-23Fixed normal EXT-6841 ([TRUNCATION] Sidebar > People. Choose and show a ↵Paul Guslisty
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-23Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window ↵Paul Guslisty
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-22trivial: convert to unix eol.Xiaohong Bao
2010-04-22Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-22fix for EXT-6928: Viewer crashes immediately after enabling HTTP Textures on ↵Xiaohong Bao
a http-texture-server-1 simulator and EXT-7009: textures fetched through http are never cached.
2010-04-22revert -r d7a43c972af0: fix for EXT-6928: Viewer crashes immediately after ↵Xiaohong Bao
enabling HTTP Textures on a http-texture-server-1 simulator and EXT-7009: textures fetched through http are never cached. This will be checked into viewer-trunk.
2010-04-22Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixXiaohong Bao
2010-04-22fix for EXT-6928: Viewer crashes immediately after enabling HTTP Textures on ↵Xiaohong Bao
a http-texture-server-1 simulator and EXT-7009: textures fetched through http are never cached.
2010-04-22EXT-7004 : Select GCC 4.0 automatically as the compiler in Xcode with Cmake ↵Aimee Linden
2.8.1 GCC 4.0 will be selected as the compiler in Xcode if building against the OS X 10.4 SDK which is incompatible with GCC 4.2 Also made it possible to override the selected SDK from the configure line, by using something like: -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING='10.4' -DCMAKE_OSX_SYSROOT:PATH='/Developer/SDKs/MacOSX10.5.sdk' Reviewed by: Poppy.
2010-04-22Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-22Implemented EXT-6724(normal task) - Implement flat list view of filtered ↵Dmitry Zaporozhan
inventory for "add wearables" panel of outfit editor 1. Modified LLInventoryItemsList - implemented delayed item construction. Items are added during draw, not more than 50 items will be added in single draw. This lets us reduce system overload during multiple panel construction. 2. Implemented LLFilteredWearableListManager to populate inventory flat list with data. This class filters entire inventory according to specified filter and populates specified inventory list with data. 3. Created LLCommonUtil::computeDifference() to avoid code copy-pasting(will use it in all appropriate places in next review request) Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/301/ --HG-- branch : product-engine
2010-04-22fixed EXT-6972 Object return notification is displayed as notification and ↵Alexei Arabadji
nearby chat toasts simultaneously Made condition of logging to nearby chat more stronger to avoid logging "object return" messages. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/300/ --HG-- branch : product-engine
2010-04-22Fixed major bug EXT-6900(Temporary bans do not show minute countdown in ↵Eugene Mutavchi
Parcel Ban List) - fixed the passing of suffix argument to LLNameListCtrl::addNameItemRow(). Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/296/ --HG-- branch : product-engine
2010-04-22merge from PE's viewer-trunk 'notifications'Tofu Linden