Commit Graph

28460 Commits (d8565b05a5ccc9df8522db1d0fb32c320fa975b9)

Author SHA1 Message Date
Nat Goodspeed d8565b05a5 CHOP-959: Introduce CmdLineChannel settings var, map --channel to it. 2013-07-02 16:33:40 -04:00
Nat Goodspeed 09d8d17382 CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.
Route --url and --slurl command-line switches through a common settings
variable. Treat them uniformly now. (Previously, passing --url would notice a
grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.)
2013-07-02 15:30:49 -04:00
Nat Goodspeed 774c410cc7 CHOP-959: add POSITION_LOCAL to LLFloaterAbout::getInfo() blob.
The existing POSITION variable gives "global" position: that is, your region-
local coordinates plus the (somewhat arbitrary) global coordinates of the
region's corner within the whole world. That may be meaningful to people on
the mainland, hard to say, but it correlates with nothing else available from
the viewer. POSITION_LOCAL gives you region-local coordinates, which could be
used (for instance) to construct a SLURL.
2013-07-02 10:09:37 -04:00
Nat Goodspeed 3d9c74dcc8 CHOP-959: Introduce and use settings vars for some cmd_line switches.
The cmd_line.xml entries:
analyzeperformance
crashonstartup
debugsession
disablecrashlogger
logmetrics
logperformance
noquicktime
replaysession
all specify map-to settings.xml variables -- none of which existed! Introduce
such variables. Instead of detecting the presence of a particular switch in
the command-line parser, use the value of its corresponding settings variable.
2013-07-01 16:19:24 -04:00
Nat Goodspeed c08b60ac6f CHOP-959: Streamline processing for --graphicslevel switch.
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
Nat Goodspeed 4a9b688b4d CHOP-959: Make settings.xml actually valid XML LLSD.
UserLoginInfo block had <key>Value</key> without the required subsequent
element to provide any actual value. This confused at least the Python
LLSD reader.
2013-06-27 16:11:48 -04:00
Nat Goodspeed e060f7a6e5 CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.
It seems that certain build hosts have an (obsolete? broken?) install of
indra.util.llmanifest under the system Python. If we append the local repo
indra/lib/python to sys.path, viewer_manifest.py pulls in the broken
llmanifest. Prepend to sys.path instead to ensure we get the right one.
2013-06-27 12:50:06 -04:00
Nat Goodspeed d5febe1ab5 CHOP-956: Add settings_install.xml to settings_files.xml.
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from
settings_files.xml.
2013-06-27 11:07:12 -04:00
Nat Goodspeed b0d7619f20 CHOP-957: Stop looking for, or parsing, Mac arguments.txt file. 2013-06-25 17:33:36 -04:00
Nat Goodspeed 316f1fd026 CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.
However, for backwards compatibility, continue to recognize and discard
--skip-gridargs switch.
2013-06-25 17:08:16 -04:00
Nat Goodspeed b7ac6c6b53 CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.
Instead of generating viewer command-line switch overrides into
the Windows shortcut,
an arguments.txt file on Mac, or
a gridargs.dat file on Linux,
generate a platform-independent settings_install.xml file containing
'sourceid' key (if 'sourceid' found in TeamCity environment variables).
All command-line override switches previously found in the aforementioned
files have happily become moot.
2013-06-24 16:49:47 -04:00
Oz Linden 2655c7a17a merge increment of version number 2013-06-19 09:00:45 -04:00
Oz Linden dd574045c4 correct 3.6.0-release for last minute fix 2013-06-19 09:00:00 -04:00
Oz Linden 519d95cee2 commit inital tag for 3.6.0-release 2013-06-19 08:59:10 -04:00
Oz Linden 1eb20a8522 correct banding issue 2013-06-18 13:21:27 -04:00
Oz Linden cb5289e02a remove files incorrectly brought back from the past by merges 2013-06-18 12:31:54 -04:00
Oz Linden 1e41b017e1 increment viewer version to 3.6.1 2013-06-14 18:49:52 -04:00
Oz Linden 9b17747706 Added tag 3.6.0-release for changeset 69429d81ae4d 2013-06-14 18:49:18 -04:00
Graham Linden 0a61606b79 NORSPEC-251 fix issues with binding unloaded standard bumpmaps 2013-06-14 14:39:18 -07:00
Graham Linden f04e9363b9 NORSPEC-266 fix issues with observer feedback on edits of material map parameters 2013-06-14 09:41:33 -07:00
Graham Linden fec6ab591e Disable asserts in CalculateTangentArray (discussed with davep) to avoid debugging interruptions from bad assets 2013-06-14 09:32:23 -07:00
Graham Linden 8d35d9ee2f NORSPEC-250 speculative stab in the dark 2013-06-13 15:58:20 -07:00
Graham Madarasz 8c41ff72ac Fix ternary use found illegit in the eyes of GCC 2013-06-13 10:52:30 -07:00
Graham Madarasz 6583bfe262 Merge vwr-dev-mat 2013-06-13 08:59:42 -07:00
Oz Linden 1f2125cc12 correct DOS line endings 2013-06-13 11:45:54 -04:00
Graham Madarasz 98d2a434db NORSPEC-263 replaced dropped deg to rad conversion between UI and material update 2013-06-13 08:23:40 -07:00
Graham Madarasz ac018153cb MAINT-2632 speculative guards in display_startup based on prevalence of crashes ending there (no repro, unfortunately) 2013-06-13 07:57:22 -07:00
Graham Madarasz 8ad2c0b8fb NORSPEC-260 fix issues with OK after pressing none being intepreted as add a null normal map 2013-06-12 15:01:23 -07:00
Graham Madarasz b60ea52902 NORSPEC-251 fixed and 258 not regressed 2013-06-12 14:08:16 -07:00
Graham Madarasz 3eb460f772 Remove NaN guards from vopartgroup and volume code 2013-06-12 12:25:30 -07:00
Graham Madarasz 88553c9eb1 Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8 2013-06-12 12:19:48 -07:00
Graham Madarasz b070bb1c22 Merge 2013-06-12 10:28:14 -07:00
Graham Madarasz 9726f3774d Backout tangent assert experiment 2013-06-12 10:26:06 -07:00
Graham Madarasz 1a37ea3671 Pedantic adj overly concerned with minute details or formalisms 2013-06-12 09:38:04 -07:00
Graham Madarasz d2b253f1f6 Changes to protect against use of normalize3fast on degenerate vectors 2013-06-12 09:16:19 -07:00
Graham Madarasz 48324a9383 Fix issues with NaNs in tangent data from using normalize3fast on zero-length vectors and other data conditioning; also added assert to normalize3fast to make finding these problems easier in the future 2013-06-12 08:09:29 -07:00
Graham Madarasz 7ad631e6ea Merge vwr-dev-mat 2013-06-11 17:20:06 -07:00
Graham Madarasz 96f7f6d01b NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI correctly and fix issues with transition from no-bumps to normal maps 2013-06-11 17:18:20 -07:00
Dave Parks 320677a6ce Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-11 16:42:34 -05:00
Dave Parks 471182e913 NORSPEC-259 Fix for crash in LLRenderTarget::copyContentsToFramebuffer 2013-06-11 16:26:57 -05:00
Graham Madarasz 7fcbb7c177 Fix build failure from warning and dav3p no-JIRA bug about normal map scale editing 2013-06-11 13:54:03 -07:00
Graham Madarasz 87946113cc NORSPEC-257 can't use automated TEMaterialGet functor as we need two possible defaults for diffuse alpha mode based on the alpha content of the diffuse texture 2013-06-11 12:48:59 -07:00
Graham Madarasz 01f595d871 Speculative fix for tangent calc asserts on Mac 2013-06-11 12:02:54 -07:00
Dave Parks 840c2f9237 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-11 12:04:14 -05:00
Graham Madarasz 5c1144c48b NORSPEC-222 fix issues with removing the use texture item selecting weave when the TE was BUMPY_TEXTURE, but no normal map was applied 2013-06-10 19:06:19 -07:00
Graham Madarasz e666725f9d NORSPEC-257 fix alpha mode display incorrect default when alpha is present in tex 2013-06-10 18:49:50 -07:00
Graham Madarasz 6b2a22e11c MAINT-2777 work-around for APR assert_always causing random crash in materials build 2013-06-10 16:55:05 -07:00
Graham Madarasz a4676adebb NORSPEC-251 fix issues with not binning objects changed from having a material to using legacy bumps causing incorrect rendering 2013-06-10 15:49:09 -07:00
Graham Madarasz 9d73f625ab NORSPEC-252 fix reverting normal maps to none 2013-06-10 15:17:45 -07:00
Dave Parks d09f1e7117 NORSPEC-242 Followup, fix a couple more sources of NaN and infinity. 2013-06-10 16:01:53 -05:00