summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-06-07fix line endings (no code change)Oz Linden
2012-06-07merge changes for DRTVWR-162Oz Linden
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-06merge changes for DRTVWR-161Oz Linden
2012-06-04merge back 3.3.3-beta1 fixesOz Linden
2012-06-04merge changes for DRTVWR-157Oz Linden
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-05-31STORM-1812 Added teleport started callbackJonathan Yap
2012-05-30STORM-1812 First pass at adding teleport started signalJonathan Yap
2012-05-30merge changes for storm-1852Oz Linden
2012-05-30merge changes for storm-1858Oz Linden
2012-05-30merge changes for storm-1862Oz Linden
2012-05-30merge changes for storm-1863Oz Linden
2012-05-30STORM-1812 Add debugging lines and call audio_update to try to work around a ...Jonathan Yap
2012-05-30merge changes for storm-1860Oz Linden
2012-05-29increment viewer version to 3.3.4Oz Linden
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 latest viewer-releaseOz 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-20STORM-1812 Store playing state from an additional place.Jonathan Yap
2012-05-18MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floatersRichard Linden
2012-05-18STORM-1862 The left-hand border of the input field for IMs is missingHitomi Tiponi
2012-05-18STORM-1812 / subtask STORM-1861 Media auto-play is off - but music stream sta...Jonathan Yap
2012-05-18MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
2012-05-18STORM-1860 Remove obsolete code and file(s) for mesh model upload wizardJonathan Yap
2012-05-18STORM-1858 [TRUNCATED] FR - String truncation and floater not wide enough in ...Jonathan Yap
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)
2012-05-14STORM-1812 Tweak how music is restarted for teleport within a parcelJonathan Yap
2012-05-11STORM-1852 Altitude display stutters or is clamped when flying higher than 4096mJonathan Yap
2012-05-09CHOP-900: Fix test.cpp merge errors merging up to viewer-releaseNat Goodspeed