summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-06-28merge up to 3.3.3-releaseOz Linden
2012-06-21merge changes for storm-1871Oz Linden
2012-06-19merge changes for open-142Oz Linden
2012-06-18merge changes for storm-1878Oz Linden
2012-06-18merge changes for storm-1868Oz Linden
2012-06-18merge changes for storm-1844Oz Linden
2012-06-18merge changes for storm-1877Oz Linden
2012-06-18merge changes for storm-1843Oz Linden
2012-06-18STORM-1844: Block and Ignore buttons on llDialog() menus overlap when there i...MartinRJ Fayray
2012-06-13MergeGeenz
2012-06-12Enable /LARGEADDRESSAWARE compiler flag for windows compilingTank_Master
2012-06-11storm-1843: remove unused ParcelMediaURLFilter codeKadah_Coba
2012-06-11Merge viewer HTTP test repositoryTank_Master
2012-06-11remove tooltip when hovering over main volume icon in the status barTank_Master
2012-06-10STORM-1878: Blocking an avatar does not derender worn lightsMartinRJ Fayray
2012-06-08STORM-1877 Missing entries in strings.xml for some Inventory folder namesJonathan Yap
2012-06-08SH-3153 FIXBrad Payne (Vir Linden)
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-07remove gear iconTank@Test_Master.ftrdhcpuser.net
2012-06-07widen the floater a bit to make more room for translationsTank@Test_Master.ftrdhcpuser.net
2012-06-07MAINT-1144: Merge llhttpclient_test.cpp fix back to tipNat Goodspeed
2012-06-07MAINT-1144: Try to fix Windows build error in llhttpclient_test.cpp.Nat Goodspeed
2012-06-06Automated merge with file:///Users/nat/linden/viewer-maint-1144Nat Goodspeed
2012-06-06MAINT-1144: Re-enable skipped LLHTTPClient tests with local server.Nat Goodspeed
2012-06-06MAINT-1144: Break out llhttpclient_tut as standalone integration test.Nat Goodspeed
2012-06-06MAINT-1144: Unblock build for previous commit.Nat Goodspeed
2012-06-06MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.Nat Goodspeed
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-05-29move floater over so it is not partly off screenTank_Master
2012-05-29Add individual volume controls to pannel_volume_pulldownTank_Master
2012-05-29merge changes for DRTVWR-153Oz Linden
2012-05-29merge changes for DRTVWR-155Oz Linden
2012-05-29merge changes for DRTVWR-148Oz Linden
2012-05-26merge changes for DRTVWR-156Oz Linden
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-24merge changes for DRTVWR-154Oz Linden
2012-05-24merge changes for DRTVWR-151Oz Linden
2012-05-24FIX VWR-23844 VWR-26542 VWR-28950eli
2012-05-24sync with viewer-releaseeli
2012-05-22merge changes for DRTVWR-152Oz Linden
2012-05-22merge changes for DRTVWR-149Oz Linden
2012-05-22merge changes for DRTVWR-147Oz Linden
2012-05-21MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
2012-05-18MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floatersRichard Linden
2012-05-18MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
2012-05-17MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards.Dave Parks
2012-05-17MAINT-938 FIXED (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
2012-05-16MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.simon@Simon-PC.lindenlab.com
2012-05-16FIX VWR-23844 VWR-26542 VWR-28950eli
2012-05-14partial fix for SH-3132 - reduce max concurrent http requests to same level a...Brad Payne (Vir Linden)