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

Fix Issue 1344: Weird mesh distorted bug

Browse Source 
Animations require consistent names for points like Avatar Center between viewers
To fix this, we now use Avatar Center instead of Root at the lower levels,
but this is okay, we translate Avatar Center into Root at UI level!
This commit is contained in:
Inusaito Sayori
2014-01-25 09:44:42 -05:00
parent 236fa2a284
commit 42bf70849c
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/character/avatar_lad.xml
View File

@@ -408,7 +408,7 @@
id="40"
group="6"
pie_slice="4"
name="Root"
name="Avatar Center"
joint="mRoot"
position="0 0 0"
rotation="0 0 0"

22
indra/newview/llvoavatarself.cpp
View File

@@ -388,11 +388,11 @@ void LLVOAvatarSelf::buildContextMenus()
LLMenuItemCallGL* item;
// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
// We need the userdata param to disable options in this pie menu later on (Left Hand / Right Hand option)
item = new LLMenuItemCallGL(attachment->getName(),
item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
NULL,
object_selected_and_point_valid, attachment);
// [/RLVa:KB]
// item = new LLMenuItemCallGL(attachment->getName(),
// item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
// NULL,
// object_selected_and_point_valid);
item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", iter->first);
@@ -425,7 +425,7 @@ void LLVOAvatarSelf::buildContextMenus()
LLViewerJointAttachment* attachment = iter->second;
if (attachment->getGroup() == i)
{
gDetachPieMenu->addChild(new LLMenuItemCallGL(attachment->getName(),
gDetachPieMenu->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
&handle_detach_from_avatar, object_attached, attachment));
attachment_found = TRUE;
@@ -451,16 +451,16 @@ void LLVOAvatarSelf::buildContextMenus()
LLMenuItemCallGL* item;
// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
// We need the userdata param to disable options in this pie menu later on
item = new LLMenuItemCallGL(attachment->getName(),
item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
NULL,
object_selected_and_point_valid, attachment);
// [/RLVa:KB]
// item = new LLMenuItemCallGL(attachment->getName(),
// item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
// NULL,
// object_selected_and_point_valid);
item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", iter->first);
gAttachScreenPieMenu->addChild(item);
gDetachScreenPieMenu->addChild(new LLMenuItemCallGL(attachment->getName(),
gDetachScreenPieMenu->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
&handle_detach_from_avatar, object_attached, attachment));
}
}
@@ -482,13 +482,13 @@ void LLVOAvatarSelf::buildContextMenus()
continue;
}
// RELEASE-RLVa: random comment because we want know if LL ever changes this to not include "attachment" as userdata
LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(),
LLMenuItemCallGL* item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
NULL, &object_selected_and_point_valid,
&attach_label, attachment);
item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", iter->first);
gAttachSubMenu->addChild(item);
gDetachSubMenu->addChild(new LLMenuItemCallGL(attachment->getName(),
gDetachSubMenu->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
&handle_detach_from_avatar, object_attached, &detach_label, attachment));
}
@@ -546,14 +546,14 @@ void LLVOAvatarSelf::buildContextMenus()
{
// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
// We need the userdata param to disable options in this pie menu later on
LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(),
LLMenuItemCallGL* item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
NULL, object_selected_and_point_valid, attachment);
// [/RLVa:KB]
// LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(),
// LLMenuItemCallGL* item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
// NULL, object_selected_and_point_valid);
gAttachBodyPartPieMenus[group]->addChild(item);
item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", attach_index);
gDetachBodyPartPieMenus[group]->addChild(new LLMenuItemCallGL(attachment->getName(),
gDetachBodyPartPieMenus[group]->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
&handle_detach_from_avatar,
object_attached, attachment));
if (!context) cur_pie_slice++;

2
indra/newview/skins/default/xui/de/strings.xml
View File

@@ -1955,7 +1955,7 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Left Pec">Linke Brust</string>
<string name="Right Pec">Rechts</string>
<string name="Neck">Hals</string>
<string name="Root">Basis</string>
<string name="Avatar Center">Basis</string>
<string name="Invalid Attachment">Ungültige Stelle für Anhang</string>
<!-- HUD Position -->

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

@@ -3231,7 +3231,7 @@ The
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="Avatar Center">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->

2
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -3746,7 +3746,7 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Left Pec">Pectoral Izquierdo</string>
<string name="Right Pec">Pectoral Derecho</string>
<string name="Neck">Cuello</string>
<string name="Root">Base</string>
<string name="Avatar Center">Base</string>
<string name="Invalid Attachment">Punto de anexión inválido</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->