livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Leyla Farazha 2009-11-16 13:58:18 -08:00
parent 7cc233b3a8 f1da0a4ff4
commit 07cbace05f
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llmanip.cpp
View File

@ -429,9 +429,10 @@ void LLManip::renderXYZ(const LLVector3 &vec)
const S32 PAD = 10;
std::string feedback_string;
LLVector3 camera_pos = LLViewerCamera::getInstance()->getOrigin() + LLViewerCamera::getInstance()->getAtAxis();
S32 vertical_offset = gViewerWindow->getWindowHeightScaled() / 2 - VERTICAL_OFFSET;
S32 window_center_x = gViewerWindow->getWindowWidthScaled() / 2;
S32 window_center_y = gViewerWindow->getWindowHeightScaled() / 2;
S32 window_center_x = gViewerWindow->getWorldViewRectScaled().getWidth() / 2;
S32 window_center_y = gViewerWindow->getWorldViewRectScaled().getHeight() / 2;
S32 vertical_offset = window_center_y - VERTICAL_OFFSET;
glPushMatrix();
{

2
indra/newview/llviewerwindow.cpp
View File

@ -4129,7 +4129,7 @@ void LLViewerWindow::drawMouselookInstructions()
{
// Draw instructions for mouselook ("Press ESC to return to World View" partially transparent at the bottom of the screen.)
const std::string instructions = LLTrans::getString("LeaveMouselook");
const LLFontGL* font = LLFontGL::getFont(LLFontDescriptor("SansSerif", "Huge", LLFontGL::BOLD));
const LLFontGL* font = LLFontGL::getFont(LLFontDescriptor("SansSerif", "Large", LLFontGL::BOLD));
//to be on top of Bottom bar when it is opened
const S32 INSTRUCTIONS_PAD = 50;

7
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -581,9 +581,10 @@ Multiple faces are currently selected.
If you continue this action, separate instances of media will be set on multiple faces of the object.
To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add.
<usetemplate
name="okcancelignore"
notext="Cancel"
yestext="OK"/>
ignoretext="Media will be set on multiple selected faces"
name="okcancelignore"
notext="Cancel"
yestext="OK"/>
</notification>
<notification

3
indra/newview/skins/default/xui/en/widgets/inspector.xml
View File

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- See also settings.xml UIFloater* settings for configuration -->
<inspector name="inspector"
bg_opaque_color="ToolTipBgColor"
bg_opaque_color="DkGray_66"
background_visible="true"
bg_opaque_image="none"
background_opaque="true"
bg_alpha_image="none"
/>

3
indra/newview/skins/default/xui/en/widgets/tool_tip.xml
View File

@ -5,6 +5,7 @@
padding="4"
wrap="true"
font="SansSerif"
bg_opaque_color="ToolTipBgColor"
bg_opaque_image="Tooltip"
background_opaque="true"
background_visible="true"
/>