summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-26fix for VWR-19505ZaiLynch
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-24Sync with viewer-developmentMerov Linden
2010-08-24Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries ↵Merov Linden
references, fixed llkdu cmake to simply point to lib and build
2010-08-24Re-add Dutch XUI files omitted from viewer-development conversion.Nat Goodspeed
In the original viewer-hg-convert.map file, some of the skins/default/xui/nl pathnames were mysteriously truncated, causing the corresponding files to be omitted from the initial conversion.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24update tagsconvert-repo
2010-08-24Automated merge with file:///home/moss/hg/tofu-viewer-publicTofu Linden
2010-08-24Final(???) merge from viewer-release to viewer-public.Tofu Linden
2010-08-24Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-24BuildParams - Use new 'build_debug_release_separately' flag for ↵Aimee Linden
viewer-development-import and viewer-development-fixes
2010-08-24EXT-7951 RESTORED IN VIEWER-DEVELOPMENT REPO (Mini-Location panel appearance ↵Paul Guslisty
design issues) - Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/851/ --HG-- branch : product-engine
2010-08-24EXT-7878 FIXED (Corrupted vertical scroll bar appears on 'Edit Outfit' panel ↵Paul Guslisty
if height of 'Add More' panel was changed) - Increased panel's min height Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/874/ --HG-- branch : product-engine
2010-08-24EXT-8672 FIXED ([HARD CODED] ALL LANGS The word \"Saved\" is hard coded, in ↵Paul Guslisty
the long timestamp displayed in IM when user is offline) - Created a string with a time stamp parameter and added it to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/872/ --HG-- branch : product-engine