summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-30Automated merge with ↵Oz Linden
http://bitbucket.org/aleric/viewer-development-aleric-export
2010-08-29add parameters for an oz_viewer-review2 buildOz Linden
2010-08-29pull changes for EXT-8668 and EXT-7901Oz Linden
2010-08-29merge up to latest viewer-developmentOz Linden
2010-08-29Merge changes from product-engine branchOz Linden
2010-08-27Removing two extraneous entries from viewer-hg-convert.shamap.Monroe Linden
2010-08-27Reconstructed viewer-hg-convert.shamap for the viewer-public mergeAimee 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-27Pull cg's BuildParams fixesMerov 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-27Clean up Comments in BuildParams; Replace explicit upload locations with ↵Christian Goetze (CG)
"public_build" policy.
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-26VWR-20946 : use fixed linux bundle for kduMerov Linden
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-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-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-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-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-25forcing all the teamcity service messages to be spat out at once per suite ↵Aaron Terrell (Enus)
to avoid incorrect TC reporting
2010-08-25Sync with viewer-developmentMerov Linden
2010-08-25Sync with viewer-developmentMerov Linden
2010-08-25VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patchMerov Linden
2010-08-25mergeTofu Linden
2010-08-25Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-25MergeAimee Linden
2010-08-25standardizing a couple of stragler test 'suite' names as class nameAaron Terrell (Enus)
2010-08-24seems that build out put sometimes concatenates and we miss a line in our ↵Aaron Terrell (Enus)
reporting parse, adding newlines at the beginning of each case out
2010-08-24standardizing test suite names as class name under testAaron Terrell (Enus)
2010-08-24fixing test names for reporting purposes - removing ' test'. also, updated ↵Aaron Terrell (Enus)
docs to remove that naming schema
2010-08-24commenting out object delete as windows builds are complaining: '[LogScan] ↵Aaron Terrell (Enus)
e:\w-enus_viewer-tut-teamcity\latest\indra\test\test.cpp(466) : error C2220: warning treated as error - no 'object' file generated [LogScan] e:\w-enus_viewer-tut-teamcity\latest\indra\test\test.cpp(466) : warning C4702: unreachable code'
2010-08-24Update GLSL shader sources to current $LicenseInfo$ standard.Nat Goodspeed
See https://wiki.lindenlab.com/wiki/License_Substitution for details.
2010-08-25MergeAimee Linden
2010-08-25EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL profile linksAimee Linden
Icon was being inserted before any text preceding the link. Reviewed by Richard.
2010-08-25BuildParams - Use new 'build_debug_release_separately' flag for ↵Aimee Linden
viewer-development
2010-08-24subclassing is working, thanks to changes to the subclass constructor and ↵Aaron Terrell (Enus)
ridding it of member variables
2010-08-24mergeMark Palange (Mani)
2010-08-24mergeMark Palange (Mani)
2010-08-24Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dllMerov Linden
2010-08-24clean commit of teamcity service message related changes of unit test ↵Aaron Terrell (Enus)
reporting into a clean repo
2010-08-24remove parens from mini-inspector if not using display namesLeyla Farazha