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

Fix crash and generaly wrong duplicate attribute name

Browse Source 
NameUI "type" is now "id_type"
Thanks for the help, Router!
This commit is contained in:
Liru Færs
2020-01-07 06:19:05 -05:00
parent 77b6a903ac
commit 463151c830
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llnamebox.cpp
View File

@@ -105,7 +105,7 @@ LLXMLNodePtr LLNameBox::getXML(bool save_children) const
LLView* LLNameBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory) LLView* LLNameBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
{ {
S8 type = AVATAR; S8 type = AVATAR;
node->getAttributeS8("type", type); node->getAttributeS8("id_type", type);
LLUUID id; LLUUID id;
node->getAttributeUUID("id", id); node->getAttributeUUID("id", id);
std::string loading; std::string loading;

2
indra/newview/llnameeditor.cpp
View File

@@ -137,7 +137,7 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
S32 max_text_length = 1024; S32 max_text_length = 1024;
node->getAttributeS32("max_length", max_text_length); node->getAttributeS32("max_length", max_text_length);
S8 type = AVATAR; S8 type = AVATAR;
node->getAttributeS8("type", type); node->getAttributeS8("id_type", type);
LLUUID id; LLUUID id;
node->getAttributeUUID("id", id); node->getAttributeUUID("id", id);
std::string loading; std::string loading;

2
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -78,7 +78,7 @@
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top" bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96" font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
mouse_opaque="true" name="GroupText" v_pad="0" type="1"/> mouse_opaque="true" name="GroupText" v_pad="0" id_type="1"/>
<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall" <button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Set..." label_selected="Set..." halign="center" height="16" label="Set..." label_selected="Set..."
left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" /> left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />

2
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -497,7 +497,7 @@
bottom="-126" bottom="-126"
left_delta="78" left_delta="78"
name="Group Name Proxy" name="Group Name Proxy"
width="142" type="1"/> width="142" id_type="1"/>
<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center" <button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Set" label_selected="Set..." left_delta="142" height="16" label="Set" label_selected="Set..." left_delta="142"
mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" /> mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" />

2
indra/newview/skins/default/xui/en-us/panel_group_general.xml
View File

@@ -22,7 +22,7 @@ Hover your mouse over the options for more help.
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top" bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
mouse_opaque="true" name="group_name" v_pad="0" type="1"> mouse_opaque="true" name="group_name" v_pad="0" id_type="1">
Type your new group name here Type your new group name here
</name_box> </name_box>
<text font="SansSerifSmall" name="prepend_founded_by"> <text font="SansSerifSmall" name="prepend_founded_by">