summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-05-23sync with viewer-developmenteli_linden
2011-05-23STORM-1256 WIP Moved a public method to the appropriate place.Vadim ProductEngine
2011-05-23STORM-1256 WIP Implemented editing region environment settings via the ↵Vadim ProductEngine
Region/Estate floater.
2011-05-23SH-1616 FIX SL client crashes on startup for debug buildsNyx (Neal Orman)
Added more NULL checks for llconvexdecompositionstub, to avoid crashing. Clients won't be able to upload meshes using the stub, but should be able to run the client otherwise.
2011-05-23merge latest changes (post-2.7.0) from viewer-developmentOz Linden
2011-05-21fix oops when cleaning up temporary ifndefsOz Linden
2011-05-20correct license headersOz Linden
2011-05-20fix more DOS line endingsOz Linden
2011-05-20merge changes for sh-1591Oz Linden
2011-05-20STORM-1265: partial fix for region updates; further integration with new ↵Oz Linden
dialogs needed.
2011-05-19STORM-1265: remove region texture tabOz Linden
2011-05-19STORM-1265: code changes for merging the Terrain and Ground Textures tabsOz Linden
2011-05-19FIX VWR-25021eli
2011-05-19FIX VWR-25020eli
2011-05-19FIX VWR-25019eli
2011-05-19WIP VWR-25018eli
2011-05-19FIX VWR-25017 en_xui_changeeli
2011-05-19FIX VWR-25015eli
2011-05-19FIX VWR-25011 en_xui_changeeli
2011-05-19FIX VWR-25010 en_xui_changeeli
2011-05-19FIX VWR-25009eli
2011-05-19FIX VWR-24161 en_xui_changeeli
2011-05-19STORM-1265: XUI changes for merging the Terrain and Ground Textures tabs ↵Oz Linden
(code not working yet)
2011-05-19merging head 58e0f8f72d39Oz Linden
2011-05-19merging head 7d0ac62a9c94Oz Linden
2011-05-19STORM-1269 FIXED Teleport to a region that has no env. settings now resets ↵Vadim ProductEngine
environment to defaults.
2011-05-19merge changes for storm-1100Oz Linden
2011-05-19merge changes for STORM-1259 and STORM-1175Oz Linden
2011-05-19merge changes for storm-1032Oz Linden
2011-05-19merge changes for storm-941Oz Linden
2011-05-18storm-1267Oz Linden
2011-05-18merge changes for login-messagesOz Linden
2011-05-18merge changes for storm-859Oz Linden
2011-05-18Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-05-18mergeDave Parks
2011-05-18Remove extraneous width declaration at behest of eli.Dave Parks
2011-05-18fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
2011-05-18merge latest updates from viewer-developmentOz Linden
2011-05-18merge changes for storm-941Oz Linden
2011-05-18merge changes for storm-1032Oz Linden
2011-05-18merge changes for storm-1259Oz Linden
2011-05-18merge up latest viewer-development (post mesh)Oz Linden
2011-05-17merge notifications.xml fixOz Linden
2011-05-17remove junk from after close tagOz Linden
2011-05-17Merge cleanupDave Parks
2011-05-17un-hardcode the viewer name merged in from the mesh branchOz Linden
2011-05-17Undo installer text changeeli_linden
2011-05-17Merge from viewer-development.Vadim ProductEngine
2011-05-17STORM-1196 ADDITIONAL FIX Mockup: Environment Settings floaterPaul ProductEngine
- Decreased a little bit size of the Environment Settings floater
2011-05-17STORM-1032 FIXED Artwork update for Appearance Editor "Edit" iconPaul ProductEngine
- Replaced old edit icon with the new one