summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-06-09merge changes for DRTVWR-165Oz Linden
2012-06-08SH-3153 FIXBrad Payne (Vir Linden)
2012-06-08merge changes for DRTVWR-164Oz Linden
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-08merge changes for DRTVWR-163Oz Linden
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-06MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.Nat Goodspeed
2012-06-05merge changes for storm-1872Oz Linden
2012-06-05merge changes for storm-1870Oz Linden
2012-06-05merge changes for storm-1845Oz Linden
2012-06-05storm-1703: update license statementsOz Linden
2012-06-04merge back 3.3.3-beta1 fixesOz Linden
2012-06-04merge changes for DRTVWR-157Oz Linden
2012-06-04STORM-1845: Move "Show HUD Attachments" to Me menuMartinRJ
2012-06-04STORM-1872 A line break is missing in ..\app_settings\settings.xmlJonathan Yap
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-06-01STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED...Jonathan Yap
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