summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
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-07mergeBrad Payne (Vir 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-06SH-2789 FIX - windows debug heap off by defaultBrad Payne (Vir Linden)
2012-06-05EXP-1942: BUGFIX Ensuring to clear the flag indicating that maturity changed ...Todd Stinson
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-04mergeBrad Payne (Vir Linden)
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-06-04merge dictionary importOz Linden
2012-06-04STORM-276 Dictionary import functionality and floaterKitty Barnett
2012-06-01EXP-1942: Ensuring that the teleport cancel works in the case of restarting a...Todd Stinson
2012-06-01STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED...Jonathan Yap
2012-06-01EXP-1950: Correcting typo in notification.Todd Stinson
2012-06-01merge latest fixes from KittyOz Linden
2012-05-31fix spell checker floater registrationOz Linden
2012-05-31STORM-276 FIXED Last word in a line editor isn't spell checkedKitty Barnett
2012-05-31merge changes for storm-276Oz Linden
2012-05-31MAINT-639 Fix for random rainbow effects on some prims.Dave Parks
2012-05-31STORM-276 FIXED Line editor misspells are checked every frameKitty Barnett
2012-05-31STORM-276 FIXED "Add to Ignore" doesn't triggerKitty Barnett
2012-05-31STORM-1812 Added teleport started callbackJonathan Yap
2012-05-31STORM-276 Match preferences look to that of the auto-replace functionality in...Kitty Barnett
2012-05-30STORM-1812 First pass at adding teleport started signalJonathan Yap
2012-05-30Merged with viewer-releaseKitty Barnett
2012-05-30MAINT-616 Fix for mac build.Dave Parks
2012-05-30MAINT-622 Fix for broken alpha masking on avatar clothing when Lighting and S...Dave Parks
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-30Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO...Dave Parks
2012-05-30merge changes for storm-1860Oz Linden