Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If a setting is LLSD, display it in pretty print xml in debug

Browse Source 
This should probably get its own TextEditor later on, it'd look better.
This commit is contained in:
Lirusaito
2019-04-27 03:04:11 -04:00
parent b8c9d9c0f3
commit 40faef0bf8
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llfloatersettingsdebug.cpp
View File

@@ -39,6 +39,7 @@
#include "llfloater.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
#include "llsdserialize.h"
#include "llspinctrl.h"
#include "lltexteditor.h"
#include "lluictrlfactory.h"
@@ -215,6 +216,19 @@ void LLFloaterSettingsDebug::onCommitSettings()
col4U.mV[VALPHA] = getChild<LLUICtrl>("val_spinner_4")->getValue().asInteger();
mCurrentControlVariable->set(col4U.getValue());
break;
case TYPE_LLSD:
{
auto val = getChild<LLUICtrl>("val_text")->getValue().asString();
LLSD sd;
if (!val.empty())
{
std::istringstream str(val);
if (LLSDSerialize::fromXML(sd, str) == LLSDParser::PARSE_FAILURE)
break;
}
mCurrentControlVariable->set(sd);
break;
}
default:
break;
}
@@ -522,6 +536,14 @@ void LLFloaterSettingsDebug::updateControl()
break;
}
case TYPE_LLSD:
getChildView("val_text")->setVisible(true);
{
std::ostringstream str;
LLSDSerialize::toPrettyXML(sd, str);
getChild<LLUICtrl>("val_text")->setValue(str.str());
}
break;
default:
mComment->setText(std::string("unknown"));
break;