f4d2e21f4f
Changing shortcut to toggle preference floater
2013-09-11 12:17:22 -04:00
242266890f
remove llversionviewer.h (incorrectly re-created in a merge)
2013-09-10 14:35:53 -04:00
1f9940d779
merge changes for storm-1939
2013-09-09 16:42:55 -04:00
d53f9366d0
merge changes for storm-1888
2013-09-09 16:04:45 -04:00
c4b070ae00
merge changes for 3.6.5-release
2013-09-09 14:51:34 -04:00
55ae6a7962
increment viewer version to 3.6.6
2013-09-09 14:47:01 -04:00
938e201d8f
Added tag 3.6.5-release for changeset bf6d45304601
2013-09-09 14:45:03 -04:00
8dc273b942
correct some doc strings in the autobuild config file
2013-09-05 15:18:58 -04:00
035ab9f374
open-183: improve local build number generation to account for multiple heads
2013-09-05 11:41:19 -04:00
2108e9de5b
OPEN-149: fix documentation of LLColor4 constructor for F32 vector
2013-09-04 16:37:33 -04:00
96f0d930bc
merge changes for open-187
2013-09-04 09:18:53 -04:00
5172d4edac
OPEN-187: Properly cleanup all allocated OpenSSL structures.
2013-09-03 13:50:35 -04:00
d43a302eaf
MAINT-3075: don't display the target user name as a SLURL in the RequestTeleport dialog
2013-08-29 16:51:59 -04:00
ea305b74d1
remove refresh of search attributes from draw method in About Land floater; does not seem to be needed and slows things down
2013-08-29 12:56:20 -04:00
f3043428b0
merge changes for storm-1933
2013-08-29 12:54:52 -04:00
3364614f8b
add "Settings" logging tag to make debugging settings loading easier
2013-08-29 09:27:12 -04:00
5b799244c3
merge changes for storm-1929
2013-08-28 13:05:07 -04:00
306b2d810e
Fix coding style fails
2013-08-27 16:27:19 -04:00
7614589adc
MAINT-3074: Remove warning log that kills FPS
2013-08-27 16:31:36 -04:00
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
a4e7444985
correct merge error in llupdatechecker.cpp
2013-08-26 16:43:03 -04:00
ecc4f2357d
remove unused --logevents command line option because new validation causes unmapped options to be errors
2013-08-26 16:42:31 -04:00
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
6e1138585b
increment viewer version to 3.6.5
2013-08-26 14:55:37 -04:00
08f5d3d7c0
Added tag 3.6.4-release for changeset 91ed595b716f
2013-08-26 14:52:03 -04:00
f46e07c14c
MAINT-1453 ifdef around windows-only work-around to restore 8x and 16x AA modes on Mac
2013-08-26 10:16:11 -07:00
1e2a6ee3f4
merge changes for maint-2773
2013-08-22 14:39:40 -04:00
be07694b9c
MAINT-2773: Disable texture animation doesn't work
2013-08-22 00:51:15 +02:00
ba248b8b5d
merge changes for storm-1953
2013-08-21 10:44:12 -04:00
c15d2e87ac
merge changes for storm-1952
2013-08-21 10:40:57 -04:00
c42a91421f
merge changes for 3.6.3-release
2013-08-20 10:37:10 -04:00
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
731fe3e7c6
merge changes for 3.6.3-release
2013-08-19 15:14:23 -04:00
171089207b
increment viewer version to 3.6.4
2013-08-19 14:51:04 -04:00
739327bb02
Added tag 3.6.3-release for changeset fe4f7c5e9fd2
2013-08-19 14:50:38 -04:00
53eff025bc
MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory()
2013-08-15 20:24:02 +03:00
22140012c2
MAINT-3012 FIXED Don't show Destination Guide by default on first run.
2013-08-15 12:37:24 +03:00
d2b947c1fa
merge changes for STORM-1932
2013-08-14 18:12:01 -04:00
e7bc0e6e63
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
2013-08-14 01:00:41 +02:00
6505ddb204
MAINT-2937 FIXED [CHUI] crash in LLToastIMPanel
2013-08-13 20:25:49 +03:00
91c9cc4c33
Save SL NVAPI profile only when changes have been made.
2013-08-12 11:09:05 -07:00
e1636448f8
Merged lindenlab/viewer-release into default
2013-08-07 16:40:54 -06:00
86b4019684
merge changes for DRTVWR-333
2013-08-07 12:17:39 -04:00
f4943bb2e6
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2013-08-05 19:44:12 -04:00
7f6e7fc0cb
CHOP-951, IQA-1477: Validate args for numeric command-line switches.
...
The logic in llcommandlineparser.cpp's setControlValueCB() callback function
for converting command-line switch argument values from string to the actual
type of the map-to settings variable had a couple special cases for boolean
and LLSD array. But for S32, U32 and F32, it simply used default LLSD
string-to-numeric conversion. LLSD's string-to-numeric conversion is a bit
lame: for non-numeric strings, it shrugs and returns 0.
Introduce onevalue() and badvalue() helper functions that, like certain errors
during command-line parsing, throw LLCLPError. Use them to streamline certain
redundancies in setControlValueCB(). Introduce convertTo<T>() helper function
that uses boost::lexical_cast() for slightly more stringent conversions. Add
cases for U32, S32 and F32 targets.
setControlValueCB() is actually called only by LLControlGroupCLP::notify(),
not during actual command-line parsing.
Make LLControlGroupCLP::notify() return bool. Make it catch LLCLPError, set
the error for getErrorMessage() and return false on that exception.
Package LLAppViewer::initConfiguration()'s response to initParseCommandLine()
returning false as a new handleCommandLineError() function; invoke it both
there and when LLControlGroupCLP::notify() returns false.
2013-08-05 19:43:06 -04:00
f6c7b7ac76
Pull merge from lindenlab/viewer-release
2013-08-05 14:11:52 -07:00
561e0bb1a0
merge changes for 3.6.2-release
2013-08-05 15:39:49 -04:00
efba897e45
correct coding standards problems
2013-08-05 15:38:43 -04:00
91a91d1b23
merge changes for 3.6.2-release
2013-08-05 15:10:39 -04:00
ZaiLynch