summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-29Automated merge from mesh-developmentLoren Shih
2010-12-29SH-652 Viewer crash when right-clicking an avatar while in edit modeLoren Shih
Null pointer issue.
2010-12-29allow run-time query of which timer function is being usedBrad Payne (Vir 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-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-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-26STORM-485 Reduced width of 'Cancel' button in Group Invitation floaterJonathan Yap
2010-12-24Fix another alignment issue on windowsRoxie Linden
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-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-23Fix windows build breakRoxie Linden
2010-12-23automated mergeRoxie Linden
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-23SH-655 - Project mesh viewer crashes on exit.Roxie Linden
A copy constructor was implemented which did a memcpy, which included the vtable pointer which was to another object of another class (same child though). This resulted in the wrong destructor being called. The reason for the memcpy was for alignment purposes. The solution was to move to LLVector4a, which is intrinsicly aligned. Also, did some performance optimizations based on the LLVector4a optimizations. The solution was to re-implement the
2010-12-22STORM-810 : Auto update and related changes (integration request from team ↵Merov Linden
chopper)
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-22wizard xml tweaksleyla_linden
2010-12-22Mergeleyla_linden
2010-12-22added open advanced floater linkleyla_linden
2010-12-22STORM-808 : merge webkit upgrade to Qt v4.7.1Merov Linden
2010-12-22mergeDave Parks
2010-12-22SH-658 Preserve LOD mode when switching between preview LoDs.Dave Parks
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-22Automated merge up from viewer-developmentLoren Shih
2010-12-22Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2010-12-22fix for SH-648: Crash on exit in LLViewerFetchedTexture (ref count error)Xiaohong Bao
2010-12-22STORM-466 Fix for: minimap cannot be reset to default zoomJonathan Yap
2010-12-22Update llconvexdecomposition and fix gcc compiler errorDave Parks
2010-12-22mergeDave Parks
2010-12-22SH-636 Update physics tab to new spec, move "completed" physics decomp ↵Dave Parks
callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform.
2010-12-21Mergeleyla_linden
2010-12-21fixed wizard model not previewing issues and added pan/zoomleyla_linden
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-21SH-689 Fix build issue due to assert i llviewerassetstatsLoren Shih
Changed assert to 50 since that's the new asset count. Added OTHER metrics for mesh and dummy asset types.
2010-12-21Merge from trunkAndrew A. de Laix