summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2011-05-24Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-24ER-914: Disable Parcel Privacy UI in viewer if on older simDave SIMmONs
2011-05-20correct license headersOz Linden
2011-05-20fix more DOS line endingsOz Linden
2011-05-20merge changes for sh-1591Oz 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-19merging head 58e0f8f72d39Oz Linden
2011-05-19merging head 7d0ac62a9c94Oz Linden
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-17STORM-1032 FIXED Artwork update for Appearance Editor "Edit" iconPaul ProductEngine
2011-05-16Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-16VWR-22299 Error strings for login failure conditionsJoshua Bell
2011-05-16mergeDave Parks
2011-05-16STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to ...Jonathan Yap
2011-05-16remove new search in favor of moving to a project viewerOz Linden
2011-05-16Merge cleanup.Dave Parks
2011-05-16mergeDave Parks
2011-05-16MergeJoshua Bell
2011-05-16WIP viewer side of ER-864: comment changeJoshua Bell
2011-05-15STORM-859 : Replacing winres.h with windows.h so that the viewer will build w...Wolfpup Lowenhar
2011-05-15storm-1249 and chop-661Oz Linden