Age | Commit message (Collapse) | Author |
|
|
|
cleaned up serialization of LLSD to param block so that it can round-trip
also, optimized LLXMLNode and fixed an assert
|
|
preferences before login.
|
|
|
|
(in non-release builds)
removed O(n^2) comparisons of XML nodes in favor of O(n)
|
|
and sh-2658: crash in LLPluginMessage::parse
|
|
google translate failure
|
|
|
|
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().
|
|
|
|
|
|
|
|
|
|
|
|
large LLSD objects.
|
|
into Minimal skin are declined and not present in inventory
made notification text skinnable
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Checker: UNINIT_CTOR
Function: LLXmlTreeParser::LLXmlTreeParser(LLXmlTree *)
File: /indra/llxml/llxmltree.cpp
|
|
Checker: UNINIT_CTOR
Function: LLXMLNode::LLXMLNode(const LLXMLNode&)
File: /indra/llxml/llxmlnode.cpp
|
|
|
|
integration test.
|
|
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
|
|
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)
|
|
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
|
|
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
|
|
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
|
|
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
|
|
Boost.Signals2 like the rest of the event-system-n code.
|
|
|
|
ignore-dead-branch
|
|
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
|
|
skinning-7. OK by CG.
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
|
|
|
|
OK by CG.
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
|