summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-08-30[mq]: VWR-19499-AppUriChatLimitArdy Lay
2010-08-30merging up from viewer-developmentAaron Terrell (Enus)
2010-08-30Dummy checkin to test pushes. No code change.Loren Shih
2010-08-30EXT-8771 Avatar Physics causes crash on login with release viewerLoren Shih
Added backwards compatibility support for new wearable types.
2010-08-30Automated merge with ↵Oz Linden
http://bitbucket.org/aleric/viewer-development-aleric-export
2010-08-29pull changes for EXT-8668 and EXT-7901Oz Linden
2010-08-29SNOW-737 FIXED Version agnostic libPNG linkingBoroondas Gupte
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff applied with fuzz 3: patching file indra/cmake/PNG.cmake Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines). patching file indra/llimage/llpngwrapper.cpp Hunk #1 succeeded at 215 (offset -2 lines). Hunk #2 succeeded at 363 (offset -2 lines). patching file indra/llimage/llpngwrapper.h Hunk #1 succeeded at 31 (offset -2 lines). Added entry in doc/contributions.txt. No further changes other than that.
2010-08-29merge up to latest viewer-developmentOz Linden
2010-08-28MergeAimee Linden
2010-08-27Update license block in a couple files where it was missed.Monroe Linden
2010-08-27Update license block for new files.Monroe Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-27Automated merge with file:///Users/monroe/projects/linden/hg/viewer-experienceMonroe Linden
2010-08-27VWR-20926 FIXED Fixed displaying the fake "Sidebar Toggle" tab when you ↵Vadim Savchuk
detach all sidebar tabs. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/880/
2010-08-27mergeTofu Linden
2010-08-27VWR-20696, VWR-20697 FIXED Fixed selecting re-docked tab and toggling its ↵Sergei Litovchuk
tag button state. Minor optimization of Side Tray expanding/collapsing upon toggling tab docked/undocked. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/879/.
2010-08-27Sync with viewer-developmentMerov Linden
2010-08-27SNOW-766: Add a 'printbuilddirs' command to develop.pyAleric Inglewood
2010-08-27Sync with viewer-developmentMerov Linden
2010-08-26Sync with viewer-developmentMerov Linden
2010-08-26VWR-20946 : fix erroneous error message (broken window...)Merov Linden
2010-08-26VWR-20946 : fix the viewer manifest script to take the new kdu lib name into ↵Merov Linden
account
2010-08-26mergeMark Palange (Mani)
2010-08-27VWR-20926 WIP Enabled sidebar to track detaching/attaching tabs.Vadim Savchuk
TODO: Sometimes wrong tab gets selected after attaching/detaching. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/878/
2010-08-26Remove redundant panel_classified.xml XUI file.Aimee Linden
2010-08-26mergeRichard Linden
2010-08-26Automated merge with ssh://richard@hg.lindenlab.com/richard/viewer-experienceRichard Linden
2010-08-26made layoutstack orientation mandatoryRichard Linden
2010-08-26added images for popup notificationRichard Linden
2010-08-26Added the MediaEnablePopups setting as a global on/off switch for media popups.Monroe Linden
2010-08-26Fix for a link error.Monroe Linden
2010-08-26VWR-20696, VWR-20697 WIP Added undocking/redocking tabs from Side Tray.Sergei Litovchuk
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/877/.
2010-08-26re-merge change from Thickbrick (minor collisions with changes from ↵Oz Linden
viewer-public merge)
2010-08-26EXT-8668 - Fixing accidental case change for the sake of OCD.Mark Palange (Mani)
2010-08-26Fix another mac build error.Monroe Linden
2010-08-26Fix for a mac build error.Monroe Linden
2010-08-26EXT-8727 FIXED Potential fix for a crash in ↵Vadim Savchuk
LLAppearanceMgr::updateClothingOrderingInfo. I couldn't reproduce the problem (it has happened for only two users, both running MacOSX), but from what I see in the logs, it might have been caused by (or related to) NULL COF items. I haven't found out how they appear nor what exactly causes the crash, but just for any case I added a check to make sure we don't try to update wearables ordering info for such items. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/ --HG-- branch : product-engine
2010-08-26VWR-20715 Double-click teleportAimee Linden
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2 By Twisted Laws and Thickbrick Sleaford
2010-08-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-26lame-but-effective workaround for self-editing UI bug, until the right fix ↵Tofu Linden
is ready.
2010-08-26re-merge viewer-public. has a rough edge or two, but this is closer to the ↵Tofu Linden
snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
2010-08-26Automated merge with ssh://hg.lindenlab.com/palange/viewer-developmentLynx Linden
2010-08-26EXT-7901 FIXED: Follow up fix to remove short-term hack.Lynx Linden
As advertized, I have removed the short-term hack that I put in place to make release note URLs work. I have now put in place a more general and correct solution. The key observeration from Roxie is that SLE SLurls should have the same hostname as the grid host. So now, URLs like http://google.com/app are no longer categorized as a SLurl and produce errors when you click on them.
2010-08-26fix for VWR-19505ZaiLynch
2010-08-25mergeRichard Linden
2010-08-25outfits accordions now have proper contentsRichard Linden
2010-08-25fixed regressions from changing layout panel to be a derived widget classRichard Linden
2010-08-25Force the value for the home page URL in the viewer sidebar to be persistantcallum
It's not loaded each time the side bar is opened - only at login - when it did not persist, the change to the URL that was lost after a restart.
2010-08-25fix for line editor history not moving cursor to endRichard Linden
2010-08-25forcing all the teamcity service messages to be spat out at once per suite ↵Aaron Terrell (Enus)
to avoid incorrect TC reporting