summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-18MergeKent Quirk
2010-03-18EXT-5923 - Change play/pause behavior of Nearby Media affordanceRichard Linden
reviewed by BenGlenn
2010-03-18MergeKent Quirk
2010-03-18Restore function lost in bad merge.Kent Quirk
2010-03-18mergeRichard Linden
2010-03-18EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit ↵Richard Linden
to Viewer Prefs fixed radio item values so they work in true and false cases for UseExternalBrowser reviewed by Callum
2010-03-18VWR-17631 en_xui_changeEli Linden
2010-03-18EXT-5849 - [crashhunters] Crash in LLView::drawChildren()Richard Linden
attempted fix by removing gesture combo popup lists from floater view holder reviewed by Leyla
2010-03-18merge from hotfix to viewer-2-0 and resolve conflictsKent Quirk
2010-03-18FR cycle8 translation for beta5Eli Linden
2010-03-18linguisticEli Linden
2010-03-18mergeRichard Linden
2010-03-18EXT-6426 - Role titles with UTF-8 characters prevent login when enabledRichard Linden
reviewed by Monroe
2010-03-18fixing linux build errors from bao's checkin for EXT-6093Nyx (Neal Orman)
viewer wouldn't compile under linux, due to gcc being paranoid about a few things. Fixed them up and got them reviewed. Code reviewed by bao.
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-18MergeEli Linden
2010-03-18CT-575 DA translation for beta 5 new fileEli Linden
2010-03-18CT-575 DA translation for beta 5; JA linguisticEli Linden
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-18EXT-5851 EXT-5422 crash on texture uploadNyx (Neal Orman)
Uploading texture caused the dummy avatar preview to initialize its joints twice removing extra call to initInstance removed the crash in LLJoint. Verified repro no longer crashes viewer. Code reviewed by Vir.
2010-03-18oops, type right before commit :(Richard Linden
2010-03-18EXT-6389 Fix for numbers in edit appearance not showing up on Mac.Dave Parks
2010-03-18mergeRichard Nelson
2010-03-18EXT-6347 - Crash when clicking on member's section of Oskar Linden FanclubRichard Nelson
reviewed by Callum
2010-03-18MergeEli Linden
2010-03-18DE cycle8 translation for beta 5; FR linguisticEli Linden
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-18automated merge viewer2.0->viewer2.0Loren Shih
2010-03-18EXT-6321 -- clicking on an event in the main map now invokes the event ↵Kent Quirk
details floater instead of trying to do a search for the event.
2010-03-17mergeRichard Nelson
2010-03-17fix for radio item not being selected after picking internal browserRichard Nelson
reviewed by Callum
2010-03-17MergeEli Linden
2010-03-17VWR-18199 en_xui_changeEli Linden
2010-03-17mergeRichard Nelson
2010-03-17EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit ↵Richard Nelson
to Viewer Prefs had to fix how radio groups bind to saved settings to support changing radio item order tested all existing radio groups bound to a saved setting reviewed by Callum
2010-03-17FR linguistic; JA cycle8 translation for beta 5Eli Linden
2010-03-17fix for EXT-6420: crash at LLImageRaw::LLImageRaw [secondlife-bin ↵Xiaohong Bao
llimage.cpp:271]
2010-03-17MergeEli Linden
2010-03-17VWR-17383 en_xui_changeEli Linden
2010-03-17EXT-6252 : "Duplicate items (not links) in inventory are both displayed in ↵Loren Shih
bold as (worn) when only one is actually worn" Simple special-case fix for this specific issue, although I added a comment to llwearablelist.h that eventually the whole LLWearableList class will need some redesign. Core issue is that you can have multiple itemIDs pointing to the same assetID and LLWearableList doesn't account for this possibility during lookup-wearable-by-assetID operations.
2010-03-17mergePalmer Truelson
2010-03-17EXT-6419 Adding comma to viewer stats texture time outputPalmer Truelson
2010-03-17more for lltexturecache.cpp: fix the crash due to deleting the entries ↵Xiaohong Bao
header file after clearing the texture cache.
2010-03-17MergeEli Linden
2010-03-17Fix for EXT-5975: don't display a toast warning for none/none parcel media ↵Monroe Linden
mime type Modified LLParcelMediaAutoPlay and LLParcelMedia so that it should no longer attempt to create media instances when the media type is set to "none/none". Also, made LLViewerParcelMedia::getURL() return an empty string when the media type is none/none, which should make the UI better reflect the fact that it won't be loaded. Reviewed by Callum at http://codereview.lindenlab.com/686010
2010-03-17linux parts for EXT-4819 [NUX] New Application Icon IntegrationTofu Linden
2010-03-17EXT-6419 : Adding texture time metric to viewer statsPalmer Truelson
Reviewed by Mani
2010-03-17EXT-2180 IT set2 final edit for beta5Eli Linden
2010-03-17PE mergeTofu Linden
2010-03-17PE merge.Tofu Linden