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

Merge remote-tracking branch 'singu/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2014-02-01 22:34:13 +01:00
parent 6547452136 2a812e0e81
commit ebb4489c01
11 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionviewer.h.in
View File

@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 8;
const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = ${vBUILD};
const char * const LL_CHANNEL = "${VIEWER_CHANNEL}";

2
indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
View File

@@ -34,7 +34,7 @@ mat4 getObjectSkinnedTransform()
vec4 w = fract(weight4);
vec4 index = floor(weight4);
index = min(index, vec4(63.0));
index = min(index, vec4(51.0));
index = max(index, vec4( 0.0));
float scale = 1.0/(w.x+w.y+w.z+w.w);

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"

4
indra/newview/lldrawpoolavatar.cpp
View File

@@ -1570,7 +1570,9 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace*
LLMatrix4a mp[JOINT_COUNT];
LLMatrix4* mat = (LLMatrix4*) mp;
for (U32 j = 0; j < skin->mJointNames.size(); ++j)
U32 count = llmin((U32) skin->mJointNames.size(), (U32) JOINT_COUNT);
for (U32 j = 0; j < count; ++j)
{
LLJoint* joint = avatar->getJoint(skin->mJointNames[j]);
if (joint)

11
indra/newview/llimpanel.cpp
View File

@@ -1576,6 +1576,17 @@ const bool LLFloaterIMPanel::isModerator(const LLUUID& speaker_id)
return false;
}
BOOL LLFloaterIMPanel::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash )
{
if (getVisible() && mInputEditor->getVisible())
{
setInputFocus(true);
return TRUE;
}
return LLUICtrl::focusFirstItem(prefer_text_fields, focus_flash);
}
void LLFloaterIMPanel::onFocusReceived()
{
mNumUnreadMessages = 0;

2
indra/newview/llimpanel.h
View File

@@ -94,6 +94,8 @@ public:
void *cargo_data, EAcceptance *accept,
std::string& tooltip_msg);
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
void onFocusReceived();
void onInputEditorFocusReceived();
void onInputEditorKeystroke(LLLineEditor* caller);

7
indra/newview/llphysicsmotion.cpp
View File

@@ -45,8 +45,7 @@ typedef std::map<std::string, std::string> controller_map_t;
typedef std::map<std::string, F32> default_controller_map_t;
#define MIN_REQUIRED_PIXEL_AREA_AVATAR_PHYSICS_MOTION 0.f
#define TIME_ITERATION_STEP 0.05f
#define MINIMUM_UPDATE_TIMESTEP 0.025f
#define TIME_ITERATION_STEP 0.1f
inline F64 llsgn(const F64 a)
{
@@ -593,7 +592,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
const F32 time_delta = time - mLastTime;
// Don't update too frequently, to avoid precision errors from small time slices.
if (time_delta <= MINIMUM_UPDATE_TIMESTEP)
if (time_delta <= .01)
{
return FALSE;
}
@@ -890,4 +889,4 @@ void LLPhysicsMotion::reset()
mCharacter->setVisualParamWeight((*iter).mParam,(*iter).mParam->getDefaultWeight());
}
}
}
}

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 -->