Commit Graph

78 Commits (94ac0064354594de8adbb99084029c8b4027b2f6)

Author SHA1 Message Date
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Ricky Curtice fe2801fc63 STORM-2017: Added translatable help text to rotation.
I chose the camera’s up vector to place the help text as it provided a consistent location on the screen for the user to see the text pop up.

While doing this I realized that the calls to hud_render_utf8text utilized a condition that was guaranteed to be false based on a surrounding if-statement, and so could trivially be replaced with a constant.
Also cleaned out a compiler warning about unused private member variables in llmaniptranslate.  I don’t like warnings and useless code. :P
2014-03-03 21:50:12 -08:00
Jonathan Yap 840e1da8aa STORM-2017 Untranslatable text appears when scaling, or moving objects 2014-03-03 14:08:26 -05:00
Richard Linden 07c90b5df3 MAINT-2059 FIX Corner scaling doesn't highlight distance text
better highlighting of opposite axis when corner scaling
2014-02-28 20:32:45 -08:00
Richard Linden 0b9eeb02ab MAINT-2059 FIX Corner scaling doesn't highlight distance text
much cleanup of vector math
also made Stretch Both Sides checkbox clickable via label
2014-02-24 18:36:13 -08:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
Graham Madarasz (Graham Linden) e8dfa28697 Rollback Maestro interp changes 2013-03-14 14:12:26 -07:00
Graham Madarasz (Graham) f061b2b90e Optimize interp code to elim hundreds of divides per frame and fix jitter bugs. 2013-03-08 15:31:37 -08:00
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Todd Stinson c1a5d6a36b PATH-450: Disabling the movement and shape manipulation widgets when editing an item in a linked set. 2012-03-30 15:42:43 -07:00
Todd Stinson 378ae8ce65 PATH-199: Enforcing permanent objects in frozen state to not move. 2012-03-13 15:33:15 -07:00
Dave Parks 3efa013ee4 MAINT-939 Potential fix for crash when editing objects. 2012-04-13 11:55:44 -05:00
Dave Parks f96a6aad6b MAINT-74 Fix "show cross sections" crashing and not working in general. 2012-04-10 17:13:28 -05:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Dave Parks 2ee8154780 SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed). 2011-08-10 13:01:14 -05:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Dave SIMmONs 58f0e78cb4 Initial work on viewer motion interpolation. Changes include:
* InterpolationTime and InterpolationPhaseOut values in settings.xml to control new object interpolation code.  Use zero to revert to old logic
* Viewer motion interpolation lasts InterpolationTime and will start to phase out after InterpolationPhaseOut seconds
* Changed LLWorld::getMinAllowedZ() to take a world-position as a parameter
* Added LLVOAvatarSelf::resetRegionCrossingTimer()
* Actually reset LLVOAvatarSelf::mRegionCrossingTimer so we get sensible timing data for region crossings
* LLVOAvatarSelf::updateRegion() will update position value due to region changes
Code reviewed by Ambroff

*
2010-10-12 13:50:17 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Tofu Linden a93d2cb219 CID-363
Checker: UNINIT_CTOR
Function: LLManipTranslate::LLManipTranslate(LLToolComposite *)
File: /indra/newview/llmaniptranslate.cpp
2010-01-28 11:21:28 -08:00
James Cook b26694f2ab Again fix Mac builsd 2009-12-10 17:18:24 -08:00
James Cook e2fa9eb03a Attempt fix mac build problem with anonymous struct 2009-12-10 15:49:57 -08:00
James Cook 21333e3ffe EXT-3333 Cannot edit HUD position using the base of the position arrows
HUD attachment edit arrows have projected Z position of 0.0, so we
were eliminating half the arrows from the set of available ones.
Changed to std::vector and just sort by Z position.
Reviewed with Richard.
2009-12-10 15:13:52 -08:00
Ramzi Linden 2f0b1d164a DEV-43612 (part1) fix a typo in UI text from llmaniptranslate 2009-12-01 16:38:01 -08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
James Cook 06fd32edf6 EXT-677 Build tool arrows work again with UI size != 1.0
Must use scaled (virtual) pixels in some computations
Will review with Richard
2009-11-10 12:04:35 -08:00
Eric M. Tulla (BigPapi) c527ade45b Fix for DEV-32672 / VWR-13349. Prim move grid display wasn't mipmapping properly. 2009-11-04 19:27:00 -05:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00