summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-06-04merge changes for storm-1316Oz Linden
2011-06-02merge changes back from beta branch for SH-1691Oz Linden
2011-06-02Merge.Logan Dethrow
2011-06-02fix for SH-1691: [crashhunters] crash at ↵Xiaohong Bao
LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-06-01merge tags from beta branchOz Linden
2011-06-01merge tags from release branchOz Linden
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-01fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)Xiaohong Bao
2011-06-01Added tag DRTVWR-56_2.6.9-release, 2.6.9-release for changeset 77e5a08344c9Debi King (Dessie)
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-27Added tag 2.7.1-start for changeset 54fd44ac92e4Oz 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-26merge from viewer-pre-betaDebi King (Dessie)
2011-05-26Added tag DRTVWR-59_2.7.0-beta1, 2.7.0-beta1 for changeset 43c7ee846b7eDebi King (Dessie)
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-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
2011-05-26SH-1527 FIXED Fix for black alpha objects with lighting and shadows enabled ↵Loren Shih
and no lights around.
2011-05-26STORM-1283 - merge changes for VWR-25039, VWR-25044, VWR-25052, INTL-46Debi King (Dessie)
2011-05-25MergeXiaohong Bao
2011-05-25fix for SH-1624: Crash during viewer startup: ↵Xiaohong Bao
LLViewerTextureList::addImageToList
2011-05-25merge STORM-1275Debi King (Dessie)
2011-05-25VWR-25862 Potential fix for caches not clearing when they are supposed to.Logan Dethrow
* Removed leading delimiter from filename mask in all calls to LLDir::deleteFilesInDir() that are related to the viewer asset caches (texture, VFS, and VO).
2011-05-25WIP INTL-46 partial traditional chinese translationeli_linden
2011-05-25FIX VWR-25052 en_xui_changeeli_linden