7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04: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
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
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
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
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
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
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
14dc0106cd
FIRE-136 : Nicky Dasmijn, use hashes to search llxmlnode
2010-12-07 23:50:30 -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
15c8a8cc0a
Branding updaters & Crashloggers. These aren't used, but better to do it now.
2010-11-21 12:05:51 -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
d999da2072
DEV-41407 resurrect and fix LLControlGroup test, convert it to a llxml integration test.
2009-10-16 13:28:31 +00:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
0274c1f2b1
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
...
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
2009-07-16 17:54:58 +00:00
56e0455479
QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
...
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.
-Nyx
2009-07-14 15:14:46 +00:00
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
fcaa1ad46f
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
...
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
Arrehn