e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
0aff76bb6d
Backed out changeset: 5c74172269a4 - use hashes to search llxmlnode (conflicts to much with LL's inventory speedup)
2012-04-26 01:13:28 -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
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
1536e416d7
Merge up to 25986 / 5d3e6c6e3b60 (FS).
2012-01-17 21:18:04 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
12c3c4c747
Possible crash fix for sanity checker
2012-01-15 22:05:01 +01: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
b0bae417ee
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
a510ca889d
Added settings sanity checking system.
2011-12-13 00:46:43 +01:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
e50e549fe0
Fixing FIRE-1043 (thanks Mysty Saunders for finding the bug so fast and confirming the fix works)
2011-05-14 19:05:57 -07:00
d7d65204df
Make the client error out if it fails to parse an xml file (only errors if built with debug info or is debug build, release wont error).
...
This should make it easier to catch XML format errors before commiting them.
2011-05-14 18:43:04 -07:00
882c80b778
Upload-to-Flickr
2011-04-10 15:23:44 +01:00
10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07:00
7065a9ef5e
Making a llerrs error message more readable by putting a space where it should have had one.
...
(LGPL) //only to get in the habbit of needing that in the message
2011-01-18 20:47:47 -08:00
a30a9064b1
Merge Firestorm up to LL 2.4 Release. (initial pass)
...
RLVa needs additional merging
2011-01-18 00:50:43 -05:00
14dc0106cd
FIRE-136 : Nicky Dasmijn, use hashes to search llxmlnode
2010-12-07 23:50:30 -05:00
15c8a8cc0a
Branding updaters & Crashloggers. These aren't used, but better to do it now.
2010-11-21 12:05:51 -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
Tank_Master