bfe2377a9a
NORSPEC-342 WIP fix issues with skimpy clothes getting too skimpy in impostors
2013-08-07 08:42:35 -07:00
83fa549b56
NORSPEC-322 NORSPEC-342 WIP fix black deferred impostors, lighting bugs remain
2013-08-06 18:02:26 -07:00
3e08ccf6ab
ACME-801: Adding a suggested friend as a friend does not remove them from the suggested friend list
2013-08-06 17:12:32 -07:00
5b400d50e1
NORSPEC-322 NORSPEC-342 fix issues with black impostors and missing alpha attachments on impostors
2013-08-06 14:16:46 -07:00
b269fcb7c8
merge
2013-08-06 10:27:42 -07:00
c7342bc6c0
ACME-744: Adjusted comment to be more clear
2013-08-06 10:27:18 -07:00
d249264143
Merge
2013-08-06 13:18:12 +03: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
237dbb26f3
Merge downstream code - Vivox update
2013-08-05 14:55:12 -07:00
d5aa619146
Merge
2013-08-05 14:54:05 -07:00
e238ddf54b
MAINT-2966 : Add viewer alert info for "NoEnterRegionMaybeFull"
2013-08-05 14:53:07 -07:00
71e2efab16
Merge downstream code - Vivox release
2013-08-05 14:50:40 -07: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
629bda7cf3
merge changes for 3.6.2-release
2013-08-05 15:27:05 -04:00
74e3fb7b33
Pull merge from lindenlab/viewer-release
2013-08-05 12:14:48 -07:00
91a91d1b23
merge changes for 3.6.2-release
2013-08-05 15:10:39 -04:00
b50f54db59
Merge viewer-release with Vivox code
2013-08-05 12:03:00 -07:00
cfd80c02c3
merge changes for 3.6.2-release
2013-08-05 14:44:08 -04:00
32b8d398ec
increment viewer version to 3.6.3
2013-08-05 14:42:37 -04:00
c14ce46669
Added tag 3.6.2-release for changeset f6741d5fe8d6
2013-08-05 14:41:38 -04:00
d9d1d27227
changed wording of learn more link for ACME-797
2013-08-05 19:04:08 +01:00
fe69b4049b
NORSPEC-304 NORSPEC-336 another attempt as resolving black glow overdraw without breaking glow (even for alpha-blended) faces
2013-08-05 10:16:17 -07:00
614ee255c6
NORSPEC-336 intentionally rebreak 304 to fix glow while we find a fix that works for both
2013-08-05 09:12:41 -07:00
b75213b39a
open-185: remove duplicate gperftools entry in autobuild.xml
2013-08-05 11:19:54 -04:00
08e429e27d
NORSPEC-285 NORSPEC-293 NORSPEC-298 fix ighting diffs between alpha/non/ALM/non-ALM
2013-08-05 06:23:13 -07:00
106f161a6e
MAINT-822 FIXED [PUBLIC]Inventory window should focus on search field
2013-08-05 15:09:01 +03:00
938ad0c640
NORSPEC-305 -NORSPEC-335 fix scale and HUD anim regression from materials changes in CL 28424
2013-08-04 05:21:34 -07:00
9557926fff
NORSPEC-332 fix fullbright tex indexing fail
2013-08-03 08:25:03 -07:00
76aeb6ea70
Pull merge from lindenlab/viewer-fbc
2013-08-03 08:13:47 -07:00
14c7108ca3
NORSPEC-304 NORSPEC-334 NORSPEC-336 fix black glow overdraw without breaking glow
2013-08-03 06:52:56 -07:00
3527846196
ACME-796 : Do not flip the fbc state to failure while connecting through web browser. Handle the dismiss case as best as possible.
2013-08-02 19:25:10 -07:00
1634301568
merge
2013-08-02 18:58:54 -07:00
a4bad4ba21
ACME-744: Temporary solution. The internal browser was not setting keyboard focus properly...as to why an investigation is needed. For now explicly setting keyboard focus to the internal browser after it is displayed.
2013-08-02 18:58:37 -07:00
56b54aaf29
made checkin use a placeholder location URL when the given SLURL is not valid
2013-08-03 01:42:31 +01:00
d354acb6cd
merge
2013-08-02 14:42:20 -07:00
1abafdc8b5
Switching SLShareHost to pdp location
2013-08-02 14:42:03 -07:00
5728cc8d6f
added learn more link to panel_social_account for ACME-797
2013-08-02 20:59:46 +01:00
6fbeb1c6db
Pull merge from lindenlab/viewer-fbc
2013-08-02 12:46:48 -07:00
dd70cc8f32
ACME : Fix a spurious crash when showing the Advanced->Shortcuts menu just after launch
2013-08-02 12:44:50 -07:00
b6e1153c39
changed facebook_post_success text to be more consistent with other notification text for ACME-793
2013-08-02 19:54:42 +01:00
93e8ec86dc
changed PLACE to CHECK IN for ACME-794
2013-08-02 19:21:38 +01:00
48f702029f
MAINT-2914 FIXED Mousing over UI elements does not make them light up
2013-08-02 18:00:08 +03:00
aec50ffdad
MAINT-2902 FIXED Browser secure session indicator should be prominent
2013-08-02 20:12:55 +03:00
acda43ed38
CHOP-959: merge --graphicslevel fix up to tip
2013-08-02 10:51:11 -04:00
32a953f65e
CHOP-959: Honor --graphicslevel switch even on first viewer run.
...
Previous CHOP-959 logic set a flag to remember that settings variable
RenderQualityPerformance was set (by --graphicslevel), so it could be applied
once LLViewerWindow is constructed. But on first viewer run, LLViewerWindow
constructor calls LLFeatureManager::applyRecommendedSettings(), which resets
that settings variable! So don't just set a flag, actually capture the
requested RenderQualityPerformance value for later.
2013-08-02 10:50:19 -04:00
b19b2737b2
ACME-761 : Use the cap for the service url unless overridden by the SLShareHost setting from settings.xml
2013-08-01 21:46:37 -07:00
571ce028fd
Pull merge from lindenlab/viewer-fbc
2013-08-01 20:56:09 -07:00
Graham Linden