summaryrefslogtreecommitdiff
path: root/indra/newview
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-29mergeBrad Payne (Vir Linden)
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-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-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-23Bumping max object cache entries per region to 50k, from 20k (per ↵Don Kjer
conversation with maestro about attachments also being included in this set)
2010-12-23Bumping max number of objects to cache per region to 20k, from 10k.Don Kjer
2010-12-23automated mergeRoxie 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-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-22Merge with tip of viewer-developmentcallum
2010-12-22Merge with TiggsDon Kjer
2010-12-22Merge with viewer-developmentDon Kjer
2010-12-22Cleanup from review with Andrew and MerovDon Kjer
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-22Setting viewer version numbers back to what they were as per Merov's review ↵Andrew Meadows
request.
2010-12-22mergeAndrew Meadows