summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-14MergeKent Quirk
2010-04-14update version numberKent Quirk
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-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-13Merge Tofu's fix for the build failure introduced in bd384ded4268Kyle Ambroff
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-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)
2010-03-26If the EXT-5854 fix is correct, this assert no longer makes sense.Tofu Linden
(transplanted from 3bef6f249a0ab74f823e67fb32339abb92b13165)
2010-03-25fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture.Xiaohong Bao
(transplanted from 3939f139f6caff2bb192a2afde18e51aada4d57a)
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-6422 Infinite loop in LLMotionController::activateMotionInstanceRichard Nelson
reviewed by monroe
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-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-25more fix for EXT-5711: Some textures loading from cache seems jammed.Xiaohong Bao
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-29fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == ↵Xiaohong Bao
mHeaderEntriesInfo.mEntries)
2010-03-29fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile ↵Xiaohong Bao
[secondlife-bin lltexturecache.cpp:1292]
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-04-01fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin ↵Xiaohong Bao
lltexturecache.cpp:1111]
2010-04-07fix for all wierd crashes happening to lltexturecache.cpp, cuased by running ↵Xiaohong Bao
viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras: EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145] EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126] possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-08Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixXiaohong Bao
2010-04-08Enabling Watchdog.Mark Palange (Mani)
2010-04-08fix for EXT-6278: profile picture is blurry / fuzzy if IM is opened first.Xiaohong Bao
2010-03-29Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the ↵Monroe Linden
HTTP_USER_AGENT) The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received. Made the handler for the set_user_agent message save the string in a member variable (mUserAgent). Initialize mUserAgent to the default string in the MediaPluginWebKit constructor. initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
2010-04-08mergeRichard Linden
2010-04-08EXT-5849 - crash in LLView::drawChildren()Richard Linden
added logging to help track down cause
2010-04-08merge from PE's viewer-hotfoxTofu Linden
2010-04-02Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is ↵Monroe Linden
questionable) * remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer. * replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive * don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in) Reviewed by Richard at http://codereview.lindenlab.com/1218007
2010-03-30MergeKent Quirk
2010-03-30Fix the credits in the right file.Kent Quirk
2010-03-29Merge from viewer-2-0Kent Quirk
2010-03-29Default MediaShowOnOthers setting to false.Monroe Linden
--HG-- branch : EXT-4880
2010-03-29VWR-17649 en_xui_changeEli Linden
2010-03-29EXT-6572 (major bug) DE workaround to remove the word "Kaufen" and leave ↵Eli Linden
just the L$ link to avoid obvious linguistic error due to poor source design, at Simone's request
2010-03-29VWR-17644 undo old 'es' overridesEli Linden
2010-03-29EXT-6580 restrict size of linux's fallback font listTofu Linden
reviewed and approved for hotfix branch by Q.
2010-03-29Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-29EXT-6515 Turn off Vivox automatic crash reportingAimee Linden
2010-03-27IT translation review of set3Eli Linden
2010-03-26PL CT global editEli Linden