summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-29merge kdu unit tests (storm-744)Oz Linden
2010-12-29SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txtLoren Shih
Trivial rename (file is an unused doc file).
2010-12-28STORM-744 : Make getMetaData pass when all is stubbedMerov Linden
2010-12-28STORM-744 : Throw exception consistently so llkdu fails consistentlyMerov Linden
2010-12-28STORM-825 : Reenable the LLMatrix3::orthogonalize test in ↵Wolfpup Lowenhar
llmath/tests/m3math_test.cpp Removed the skipping of a working test as this was causeing a the test to fail building and thus not actualy running all the tests.
2010-12-28STORM-744 : Fix release building issueMerov Linden
2010-12-28STORM-242 : pull into viewer-developmentMerov Linden
2010-12-28STORM-805 : pull into viewer-developmentMerov Linden
2010-12-28STORM-682 : pull into viewer-developmentMerov Linden
2010-12-28STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to ↵Paul Guslisty
mouselook mode - After switching to the mouse look mode hide control bar immediately, not fading it with timer - Added signal for switching mouse look mode out just for convenience. It's not used in this fix.
2010-12-28STORM-242 ADDITIONAL_FIX One more build fix...Vadim ProductEngine
2010-12-28STORM-242 ADDITIONAL_FIX Fixed release build and error handling.Vadim ProductEngine
2010-12-28Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-12-27STORM-523 : pull into viewer-developmentMerov Linden
2010-12-27STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a ↵Vadim ProductEngine
region using a different server version" notification.
2010-12-27STORM-737 Eliminate commented out lineJonathan Yap
2010-12-27STORM-737 A little more code cleanup per Code Review suggestions.Jonathan Yap
2010-12-27VWR-20879: Allow find_vc_dir() to work with VCExpressRobin Cornelius
2010-12-26STORM-485 Reduced width of 'Cancel' button in Group Invitation floaterJonathan Yap
2010-12-24STORM-737 Added comment. Combined code to eliminate temporary constant.Jonathan Yap
2010-12-24STORM-737 Removed unnecessary blank link from llpanelmaininventory.cppJonathan Yap
2010-12-24STORM-744 : Took code review into account, moving stuff back in protected or ↵Merov Linden
even private, fix things to work in debug mode, some clean up in j2coj also
2010-12-24STORM-682 FIXED Fixed positioning notification toasts in mouse-look mode.Vadim ProductEngine
Toasts were positioned as if side tray was expanded. The fix is to reshape the so-called toasts screen channel (an area where toasts are drawn) on entering/leaving mouse-look mode, so that the screen channel can notice that side tray get in/visible.
2010-12-24STORM-682 WIP Removed unused code.Vadim ProductEngine
2010-12-24merge fix for storm-411Oz Linden
2010-12-24merge fix for storm-784Oz Linden
2010-12-24merge improved fix for STORM_785Oz Linden
2010-12-23Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-exportOz Linden
2010-12-23STORM-812 Make bottom buttons in Object Profile identical for single and ↵Jonathan Yap
multi-prim objects
2010-12-23STORM-737 Inventory/Recent: Gray out "New Folder" in "+" menu and enable all ↵Jonathan Yap
menu items except "New Folder" when right clicking an item.
2010-12-23STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference ↵Andrew Productengine
instead of per-machine. - Made changes in code of floater preferences and panel login that were required because of turning the setting per-account. - Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
2010-12-23STORM-438 FIXED My inventory floater is not restored if it was minimized and ↵Paul Guslisty
'Open Attachment' button was pressed in the Group Profile. - Added check whether floater is minimized
2010-12-22STORM-810 : Auto update and related changes (integration request from team ↵Merov Linden
chopper)
2010-12-22STORM-744 : pull from STORM-151Merov Linden
2010-12-22STORM-805 : add some printout to the log so we can trace the answer ↵Merov Linden
map-server-url at startup
2010-12-22Merge with tip of viewer-developmentcallum
2010-12-22STORM-808 : merge webkit upgrade to Qt v4.7.1Merov Linden
2010-12-22STORM-806 FIXED Enabled external editor for inventory scripts.Vadim ProductEngine
Changes: * Moved external editor handling to LLScriptEdCore which is shared between LLLiveLSLEditor (object script editor) and LLPreviewLSL (inventory script editor). * The Edit button is now only enabled when appropriate.
2010-12-22STORM-466 Fix for: minimap cannot be reset to default zoomJonathan Yap
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-21STORM-460 : pull in viewer-developmentMerov Linden
2010-12-21STORM-524 : pull in viewer-developmentMerov Linden
2010-12-21STORM-453 : pull in viewer-developmentMerov Linden
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-20STORM-151 : Fix llui_libtest integration testMerov Linden
2010-12-20SOCIAL-399 FIX Viewer crash when canceling http auth on a media primMonroe Linden
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20STORM-805 : Fix the map URLMerov Linden
2010-12-20Fix for a couple of minor merge issues.Monroe Linden
2010-12-20Remove unimplemented software updater option. Fix potential double start of ↵Andrew A. de Laix
updater service.