Permalink
Browse files

Merge branch 'Release' of https://github.com/Lirusaito/SingularityViewer

2 parents 34fd992 + 6707e48 commit c262210cf32fe227d422a3b7b8cc1bea18184736 @Shyotl Shyotl committed Jan 13, 2017
@@ -1023,7 +1023,7 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>LiruShowLastNameResident</key>
<map>
@@ -1216,8 +1216,8 @@ LLQuaternion LLManipRotate::dragUnconstrained( S32 x, S32 y )
F32 dist_from_sphere_center = sqrt(delta_x * delta_x + delta_y * delta_y);
LLVector3 axis = mMouseDown % mMouseCur;
+ F32 angle = atan2(sqrtf(axis * axis), mMouseDown * mMouseCur);
axis.normVec();
- F32 angle = acos(mMouseDown * mMouseCur);
LLQuaternion sphere_rot( angle, axis );
if (is_approx_zero(1.f - mMouseDown * mMouseCur))
@@ -1614,9 +1614,9 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
mInSnapRegime = FALSE;
}
- angle = acos(mMouseCur * mMouseDown);
-
- F32 dir = (mMouseDown % mMouseCur) * constraint_axis; // cross product
+ LLVector3 cross_product = mMouseDown % mMouseCur;
+ angle = atan2(sqrtf(cross_product * cross_product), mMouseCur * mMouseDown);
+ F32 dir = cross_product * constraint_axis; // cross product
if( dir < 0.f )
{
angle *= -1.f;
@@ -192,7 +192,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
play_media_enabled = true;
media_icon_color = LLUI::sColorsGroup->getColor( "IconEnabledColor" );
-
+ /* <HACK: Temporary fix until I know how to correctly catch messages from CEF. - Router Gray>
LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
switch(status)
{
@@ -216,6 +216,18 @@ void LLMediaRemoteCtrl::enableMediaButtons()
// inherit defaults above
break;
}
+ */
+ if (LLViewerMedia::isParcelMediaPlaying())
+ {
+ stop_media_enabled = true;
+ play_media_enabled = false;
+ }
+ else
+ {
+ stop_media_enabled = false;
+ play_media_enabled = true;
+ }
+ // </HACK - Router Gray>
}
}
@@ -7540,8 +7540,8 @@ Grant this request?
<form name="form">
<button
index="-2"
- name="Block"
- text="Block"/>
+ name="Mute"
+ text="Mute"/>
<button
index="-1"
name="Ignore"
@@ -7558,8 +7558,8 @@ Grant this request?
<form name="form">
<button
index="-2"
- name="Block"
- text="Block"/>
+ name="Mute"
+ text="Mute"/>
<button
index="-1"
name="Ignore"
@@ -7578,8 +7578,8 @@ Grant this request?
</input>
<button
index="-2"
- name="Block"
- text="Block"/>
+ name="Mute"
+ text="Mute"/>
<button
index="-1"
name="Ignore"
@@ -30,7 +30,7 @@
(This page does not pass the specified whitelist)
</text>
<line_editor
- max_length_bytes="1024"
+ max_chars="1024"
bottom_delta="-24"
enabled="true"
follows="left|top"

0 comments on commit c262210

Please sign in to comment.