summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-04-23Backed out changeset 4627863f43d5Tofu Linden
back-out this backout. change made in viewer-trunk, reverted in viewer-hotfix, but we want it preserved post-merge.
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-21mergeTofu Linden
2010-04-20Disabling Watchdog TimeoutMark Palange (Mani)
2010-04-20Merge hotfixbeta into hotfixKent Quirk
2010-04-19Fix for EXT-6925 (Mime type association missing for video/* wildcard).Monroe Linden
In mime_types*.xml, added <impl> sections to the mimetype entries for video/* and audio/* which point to the quicktime plugin on Mac/Windows and gstreamer on Linux. Reviewed by Callum at http://codereview.lindenlab.com/1252035
2010-04-19Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixXiaohong Bao
2010-04-19trival: remove some redundant code from llviewertexture.cpp.Xiaohong Bao
2010-04-19merge from PE's viewer-hotfixTofu Linden
2010-04-19Updated the reverted fix for critical bug EXT-1655 ([BSI] Always flying ↵Eugene Mutavchi
after pressing "Stand" to stand up from an object), also integrated the fix for EXT-6786 ('Stand' button is corrupted if movement control floater is opened). Added some clarifying comments. Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/. --HG-- branch : product-engine
2010-04-17merge from PE's viewer-hotfixTofu Linden
2010-04-16Fixed major bug EXT-6869 (Viewer crashes when switching between group voice ↵Mike Antipov
sessions) The reason: LLCallDialogManager did not disconnect from "voice channel state changed" signal on channel in previous session. Thus when old channel changes state from STATE_HUNG_UP to STATE_CALL_STARTED there is invalid pointer to session in connected LLCallDialogManager::onVoiceChannelStateChanged callback before current voice channel is changed and pointer to session becames valid. Fix: add storing of connection to signal in voice channel from previous session and disconnect it before connecting to channel in current session. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/244/ --HG-- branch : product-engine
2010-04-16EXT-6572 correct translation for "Buy L$", for 2.0.1Eli Linden
2010-04-15EXT-6877 : Show avatar-as-cloud as "Loading..." in nametagLoren Shih
If you or others are a cloud, then your nametag will include a "(Loading...)" string. Note: this required a small bit of code refactor so that you can query if an avatar (yourself or others) is a cloud; this was basically a rename from updateIsFullyLoaded into getIsCloud.
2010-04-15EXT-6847 : Deafult configuration has Away timeout set to "Never"Loren Shih
Imported from 2.1 into 2.0.1. This fix is a safe change and gives Residents useful information about why an avatar is a cloud (e.g. because the avatar minimized his window and hence is "away").
2010-04-14fixed eol styleRichard Nelson
2010-04-14fixed eol and lack of copyright in resource.hRichard Nelson
2010-04-14mergeRichard Nelson
2010-04-14EXT-2418 and EXT-6317Richard Nelson
found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
2010-04-14added cur files to textures directory for 32 bit windows cursorsRichard Nelson
2010-04-14Fix for LLVOAvatarSelf calling updateVisualParams every frame -- saves about ↵Dave Parks
2ms per frame. Reviewed by Nyx
2010-04-14MergeKent Quirk
2010-04-14Merge backout of EXT-1655Kent Quirk
2010-04-14This change originally to fix EXT-1655 has caused a failure to render ↵Kent Quirk
sitting avatars (EXT-6835). We can probably find a "right" fix, but for now backing it out. Backed out changeset bd384ded4268
2010-04-14MergeKent Quirk
2010-04-14Remove calls to llpushcallstacks from inner loops.Dave Parks
2010-04-13mergeRichard Linden
2010-04-13fix for EXT-6317 and EXT-2418 regressions in installed viewersRichard Linden
new 32-bit mouse cursors were not getting packaged by installer for windows builds reviewed by Monroe
2010-04-13Fix for EXT-6750 (disabled attachment media still plays).Monroe Linden
LLViewerMediaImpl::shouldShowBasedOnClass() was always returning true for focused media. This was incorrect, since it made click-focusing on media override the class-based disable preferences. Reviewed by Callum at http://codereview.lindenlab.com/1178023
2010-04-13Supplementary fix for EXT-6663 TOS Screen logic for enabling agreement ↵Aimee Linden
checkbox is questionable If the "alive" check on the ToS page returns before the browser plugin has loaded the Loading page, the checkbox never gets enabled, so postpone the check until the Loading page is up.
2010-04-09Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixXiaohong Bao
2010-04-09the first round of the debug code for EXT-6792: Crash on ATI 3200Xiaohong Bao
2010-04-09debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.Xiaohong Bao
2010-04-09EXT-6693 - [crashhunters] crash in LLPopupView::handleMouseEventRichard Nelson
reviewed by Monroe
2010-04-09merged from viewer-trunk, fix for EXT-6780: to make ↵Xiaohong Bao
LLImageBase::allocateData() thread-safe. Also include some debug code for EXT-6567: crash at LLImageBase::allocateData().
2010-04-07Fixed major bug EXT-6661 (chat log paths reset back to default)Mike Antipov
* Removed unused InstantMessageLogFolder * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers. * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat) Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/ (transplanted from 43297b92c1bb7487dab6610bea61acac4c355878)
2010-04-14Fixed major bug EXT-6802 (Cancelling out of People Chooser while Searching ↵Mike Antipov
Causes Crash) * Added check of Avatar Picker floater (People Chooser) against NULL in search callback. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/236/ (transplanted from 480f67e4eac0223626ce549a20760e81c4bce5b1)
2010-04-16Fixed major bug EXT-6851 (Moderator is unable to mute group voice chat ↵Mike Antipov
participant after his reconnect) Reason: not proper condition to check is LLSpeaker is in voice channel (implemented for EXT-3944) Fix: Updated condition to check is speaker in voice channel state. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/242/ (transplanted from fb2af72d10231e04b2e79a7d487ea9e8559c14b8)
2010-04-07Fixed critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to ↵Eugene Mutavchi
stand up from an object) - moved restoring the flying of the agent before calling the mAutoPilotFinishedCallback, to allow finished callback to change it. - fixed LLVOAvatar::sitOnObject() to set mIsSitting = TRUE before stoping the autopilot, like it was in 1.23 version. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/185/
2010-04-06Fixed major bug EXT-6572 (EXT-6572 ([VARIABLE IN WRONG PLACE] in Taskbar ↵Paul Guslisty
\"Kaufen L$\" should be \"L$ kaufen\") - Removed the L$ graphic and made \"L$\" part of the label string. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/172/ (transplanted from 4cbdcfc8b196f0ff28df1d0897023ee967cce2a3)
2010-04-16MergeRichard Linden
2010-04-16Backed out changeset: 61a83065d146Richard Linden
2010-04-16mergeRichard Linden
2010-04-16EXT-6895 - Crash in landmarkNameCallbackRichard Linden
reviewed by Leyla
2010-03-31EXT-2418 - improved cursors for sit/open/buy - the neglected Linux part.Tofu Linden
2010-03-30EXT-6589 "Are you sure you want to teleport.." dialog has broken ↵Tofu Linden
"[LOCATION]" tag
2010-04-07EXT-6693 - [crashhunters] crash in LLPopupView::handleMouseEventRichard Linden
2010-03-26EXT-EXT-6317 - cursor does not indicate clicking will trigger an action when ↵Richard Nelson
over transparent objects reviewed by Leyla (transplanted from 4b90aa824b05ef6d29973b55bec8eb6210e1edf9)