summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-06-04correct license headersOz Linden
2011-06-04fix DOS line endingsOz Linden
2011-06-04merge changes for storm-1318Oz Linden
2011-06-04merge changes for storm-1312Oz Linden
2011-06-04merge changes for storm-1316Oz Linden
2011-06-03FIX VWR-20803eli_linden
2011-06-03FIX VWR-20691eli_linden
2011-06-03FIX VWR-20689eli_linden
2011-06-03FIX VWR-20668eli_linden
2011-06-03 (EXP-871) FIX Add a WARNING to comment for BrowserEnableJSObject and set to ↵callum
no persist between sessions
2011-06-02merge changes back from beta branch for SH-1691Oz Linden
2011-06-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-06-02Merge.Logan Dethrow
2011-06-02FIX VWR-24130 additional linguistic fixeli_linden
2011-06-02fix for SH-1691: [crashhunters] crash at ↵Xiaohong Bao
LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-06-01pull back fix for storm-1298 from beta branchOz Linden
2011-06-01Merge. Pulling fix for VWR-25862 into bigger cache tree.Logan Dethrow
2011-06-01EXP-869 FIX -- Mac viewer should build without requiring settings modificationsLeslie Linden
Modified cmake GCC_VERSION from 4.2 to 4.0, our officially supported GCC version Reviewed by Richard
2011-06-01sync with viewer-developmenteli_linden
2011-06-01fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)Xiaohong Bao
2011-06-01merge changes for storm-1296Oz Linden
2011-06-01merge changes for storm-1304Oz Linden
2011-06-01merge changes for storm-1299Oz Linden
2011-06-01merge changes for new searchOz Linden
2011-05-31merge changes for new searchOz Linden
2011-05-31FIX VWR-25397eli_linden
2011-05-31FIX VWR-24130eli_linden
2011-05-31FIX VWR-24127eli_linden
2011-05-31FIX VWR-19315eli_linden
2011-05-31FIX VWR-24126eli_linden
2011-05-31FIX VWR-20840eli_linden
2011-05-27sync with viewer-developmenteli_linden
2011-05-27increment viewer version to 2.7.2Oz Linden
2011-05-27MergeLogan Dethrow
2011-05-27Removed unneeded platform directory delimeter lookups in llvocache.cppLogan Dethrow
2011-05-27merge changes for storm-1210Oz Linden
2011-05-27Merge with viewer-development.Logan Dethrow
2011-05-27VWR-25861 VWR-25862 Removed LLDir_Mac::deleteFilesInDir() virtual method.Logan Dethrow
The LLDir base class method will now be used instead. The handling of the mask parameter was inconsistent between the two implementations, and the failure to remove the old method was probably just an oversight.
2011-05-26FIX INTL-47 Japanese and Italian translation for set19-23, light set1-2eli_linden
2011-05-26Added newline at end of header file to fix linux build.Loren Shih
2011-05-26FIX DA hardware setting UI, en_xui_changeeli_linden
2011-05-26EXP-772: If URIs returned by SRV fail, fall back on original URI.Nat Goodspeed
2011-05-26EXP-772: If URIs returned by SRV fail, fall back on original URI.Nat Goodspeed
2011-05-27STORM-1286 - merge changes for SH-1624Debi King (Dessie)
2011-05-27STORM-1290 - merge changes for INTL-47Debi King (Dessie)
2011-05-26SH-1467 WIP Viewer checks the wrong cap for mesh-ui disableLoren Shih
Fixes that need to go into trunk because certain Mesh UI elements are showing up on DRTSIM-52. These fixes will probably be overwritten by the actual resolution of SH-1467 but I need this workaround now.
2011-05-26SH-1669 FIXED Physics properties show up on DRTSIM-52Loren Shih
2011-05-26SH-1668 FIXED Cubes can be scaled to 64^3Loren Shih
2011-05-26SH-1444 FIXED "Allow mesh objects" setting is visible on non-mesh region.Loren Shih
2011-05-26dos2unix fixes for newview files.Loren Shih