ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
54cdc322b8
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05 22:05:22 -08:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
7e7f183f0a
Fixed LLControlGroup::get() template to not crash on missing items. Reviewed
...
by Kelly
2012-10-02 09:31:38 -07:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
9e4927ece5
Make LLTransUtil::parseStrings() merge all relevant strings.xml files.
...
Until now, adding a xui/en/strings.xml file in any non-default skin meant you
had to clone the entire file, editing only the particular entries you wanted
to override. With this change, we load strings.xml file(s) from the default
skin before loading the specified skin -- so a non-default skin can now
provide a strings.xml file containing only the specific entries it wants to
override.
2012-10-11 17:29:04 -04:00
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07:00
0a28a63ce0
fix for gcc builds
2012-07-24 12:03:00 -07:00
176b7d82be
CHUI-227 FIX Teleport offers sent are not received
...
cleaned up serialization of LLSD to param block so that it can round-trip
also, optimized LLXMLNode and fixed an assert
2012-07-23 19:33:39 -07:00
55392ef7f6
EXP-1942,EXP-1945: Altering behavior when setting maturity preference to check the server response in an effort to ensure the viewer and server remain in sync. This is a partial commit as I still need to add user behavior and notifications when things go wrong.
2012-05-24 19:41:20 -07:00
e328dcf406
EXP-1849 FIXED Privacy settings could be set to default when modifying other preferences before login.
2012-02-06 23:07:41 +02:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
e219fc30ba
EXP-1837 FIX parsing notifications.xml during startup can take > 40 seconds (in non-release builds)
...
removed O(n^2) comparisons of XML nodes in favor of O(n)
2012-01-23 17:38:47 -08:00
2851cd5193
a try fix for sh-2651: [crashhunters] Crash after google translate failure
...
and sh-2658: crash in LLPluginMessage::parse
2011-11-28 11:33:49 -07:00
be3c6747a8
remove redundant memory allocation for sh-2651: [crashhunters] Crash after google translate failure
2011-11-22 11:53:44 -07:00
b59c0a6680
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-06 13:58:47 -04:00
54399f1f87
CHOP-763: publish LLControlGroup::typeStringToEnum(), typeEnumToString()
...
These LLControlGroup methods were marked 'protected'. But they're important
for introspection: LLControlVariable::type() returns an eControlType;
understanding that value outside a C++ context requires typeEnumToString().
2011-09-01 13:01:08 -04:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
42fe138cbb
Incorporated some suggestions from code review for VWR-25610
2011-04-27 19:13:17 -07:00
2840bff773
FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large LLSD objects.
2011-04-26 15:10:39 -07:00
8886460a22
SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
...
made notification text skinnable
2011-03-09 00:21:57 -08:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
01cdeb0cdd
Merge from viewer-development
2011-02-23 10:44:59 -07:00
5aa43e4f3e
SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.)
...
converted settings_file.xml to use param block descriptions for easier modification
added session settings file and user session settings file for per-session config overrides
2011-02-22 19:30:50 -08:00
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
f4ff1430f0
first iteration of memory pool code
2010-12-03 22:16:16 -07:00
1e050c2ed8
merge
2010-12-02 14:33:42 -08:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
656b936915
Add name, value info to convert_from_llsd<> specialization LL_ERRS.
...
Prior to this, you could get a viewer crash whose ERROR: message said only:
convert_from_llsd<std::string>: Invalid string value
This gave no hint as to *which value* was wrong, or where to go fix it.
Ironically, each convert_from_llsd<> specialization already has the
control_name and LLSD value in hand; added these to each such LL_ERRS message.
2010-11-09 14:40:32 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
0fa63baf37
fix for gcc
2010-10-07 11:30:55 -07:00
0e05afdac5
allow passing LLSD arguments on command line
2010-10-06 19:41:55 -07:00
295de1a537
Put some errant tests under if (LL_TESTS) conditional.
2010-09-30 15:56:41 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
855192a83b
VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake files
2010-08-18 17:41:36 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
b7405a144e
CID-266
...
Checker: UNINIT_CTOR
Function: LLXmlTreeParser::LLXmlTreeParser(LLXmlTree *)
File: /indra/llxml/llxmltree.cpp
2010-02-03 20:45:53 +00:00
a788f758e4
CID-267
...
Checker: UNINIT_CTOR
Function: LLXMLNode::LLXMLNode(const LLXMLNode&)
File: /indra/llxml/llxmlnode.cpp
2010-02-03 20:44:32 +00:00
f9385314ac
Backporting from hg branch @ 3495: Fix to integration test.
2009-10-19 22:31:47 +00:00
Oz Linden