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

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Browse Source 
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
This commit is contained in:
Lirusaito
2013-06-25 19:37:50 -04:00
parent 306df58793 2793ca9e04
commit c2cc398339
16 changed files with 284 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/llprogressbar.cpp
View File

@@ -73,19 +73,19 @@ LLProgressBar::~LLProgressBar()
void LLProgressBar::draw()
{
static LLTimer timer;
LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
F32 alpha = getDrawContext().mAlpha;
//LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("progressbar_fill.tga");
LLUIImagePtr bar_bg_imagep = LLUI::getUIImage("progressbar_track.tga");
LLUIImagePtr bar_imagep = LLUI::getUIImage("rounded_square.tga");
//LLUIImagePtr bar_imagep = LLUI::getUIImage("rounded_square.tga");
LLColor4 background_color = LLUI::sColorsGroup->getColor("LoginProgressBarBgColor");
bar_bg_imagep->draw(getLocalRect(),
background_color);
bar_bg_imagep->draw(getLocalRect(), background_color % alpha);
LLRect progress_rect = getLocalRect();
progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
bar_fg_imagep->draw(progress_rect);
bar_fg_imagep->draw(progress_rect, LLColor4::white % alpha);
}
void LLProgressBar::setPercent(const F32 percent)

22
indra/newview/app_settings/settings.xml
View File

@@ -16792,6 +16792,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<real>0.40000000596</real>
</map>
<key>moapbeacon</key>
<map>
<key>Comment</key>
<string>Beacon / Highlight media on a prim sources</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>particlesbeacon</key>
<map>
<key>Comment</key>
@@ -16924,17 +16935,6 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>keepbeacons</key>
<map>
<key>Comment</key>
<string>Keep beacons when closing floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>ClearBeaconAfterTeleport</key>
<map>
<key>Comment</key>

96
indra/newview/llfloaterbeacons.cpp
View File

@@ -36,7 +36,6 @@
#include "llviewercontrol.h"
#include "lluictrlfactory.h"
#include "llcheckboxctrl.h"
#include "llsliderctrl.h"
#include "pipeline.h"
// [RLVa:KB]
@@ -45,8 +44,6 @@
LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml");
// Initialize pipeline states from saved settings.
// OK to do at floater constructor time because beacons do not display unless the floater is open
// therefore it is OK to not initialize the pipeline state before needed.
@@ -59,20 +56,14 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
LLPipeline::setRenderParticleBeacons( gSavedSettings.getBOOL("particlesbeacon"));
LLPipeline::setRenderHighlights( gSavedSettings.getBOOL("renderhighlights"));
LLPipeline::setRenderBeacons( gSavedSettings.getBOOL("renderbeacons"));
getChild<LLTextBox>("beacon_width_label")->setEnabled(gSavedSettings.getBOOL("renderbeacons"));
getChild<LLSliderCtrl>("beacon_width")->setEnabled(gSavedSettings.getBOOL("renderbeacons"));
LLPipeline::setRenderMOAPBeacons( gSavedSettings.getBOOL("moapbeacon"));
mCommitCallbackRegistrar.add("Beacons.UICheck", boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1));
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml");
}
BOOL LLFloaterBeacons::postBuild()
{
childSetCommitCallback("always_on", onClickUICheck, this);
childSetCommitCallback("touch_only", onClickUICheck, this);
childSetCommitCallback("scripted", onClickUICheck, this);
childSetCommitCallback("physical", onClickUICheck, this);
childSetCommitCallback("sounds", onClickUICheck, this);
childSetCommitCallback("particles", onClickUICheck, this);
childSetCommitCallback("highlights", onClickUICheck, this);
childSetCommitCallback("beacons", onClickUICheck, this);
return TRUE;
}
@@ -105,64 +96,59 @@ void LLFloaterBeacons::close(bool app_quitting)
// Callback attached to each check box control to both affect their main purpose
// and to implement the couple screwy interdependency rules that some have.
//static
void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl)
{
LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
std::string name = check->getName();
LLFloaterBeacons* view = (LLFloaterBeacons*)data;
if (name == "always_on") gSavedSettings.setBOOL("BeaconsKeepVisible", check->get());
else if (name == "touch_only") LLPipeline::setRenderScriptedTouchBeacons(check->get());
else if (name == "scripted") LLPipeline::setRenderScriptedBeacons(check->get());
else if (name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get());
else if (name == "sounds") LLPipeline::setRenderSoundBeacons(check->get());
else if (name == "particles") LLPipeline::setRenderParticleBeacons(check->get());
else if (name == "highlights") LLPipeline::setRenderHighlights(check->get());
else if (name == "beacons")
{
bool enabled = check->get();
LLPipeline::setRenderBeacons(enabled);
view->getChild<LLTextBox>("beacon_width_label")->setEnabled(enabled);
view->getChild<LLSliderCtrl>("beacon_width")->setEnabled(enabled);
}
if (check->get())
if (name == "touch_only")
{
LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
// Don't allow both to be ON at the same time. Toggle the other one off if both now on.
if (LLPipeline::getRenderScriptedTouchBeacons(NULL) &&
LLPipeline::getRenderScriptedBeacons(NULL) )
{
if (name == "touch_only")
{
LLPipeline::setRenderScriptedBeacons(FALSE);
view->getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(FALSE));
}
else
{
LLPipeline::setRenderScriptedTouchBeacons(FALSE);
view->getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(FALSE));
}
LLPipeline::setRenderScriptedBeacons(FALSE);
getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(FALSE));
}
}
else
else if (name == "scripted")
{
LLPipeline::toggleRenderScriptedBeacons(NULL);
// Don't allow both to be ON at the same time. Toggle the other one off if both now on.
if (LLPipeline::getRenderScriptedTouchBeacons(NULL) &&
LLPipeline::getRenderScriptedBeacons(NULL) )
{
LLPipeline::setRenderScriptedTouchBeacons(FALSE);
getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(FALSE));
}
}
else if (name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get());
else if (name == "sounds") LLPipeline::setRenderSoundBeacons(check->get());
else if (name == "particles") LLPipeline::setRenderParticleBeacons(check->get());
else if (name == "moapbeacon") LLPipeline::setRenderMOAPBeacons(check->get());
else if (name == "highlights")
{
LLPipeline::toggleRenderHighlights(NULL);
// Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
if (!LLPipeline::getRenderBeacons(NULL) &&
!LLPipeline::getRenderHighlights(NULL))
{
if (name == "highlights")
{
LLPipeline::setRenderBeacons(TRUE);
view->getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
view->getChild<LLTextBox>("beacon_width_label")->setEnabled(TRUE);
view->getChild<LLSliderCtrl>("beacon_width")->setEnabled(TRUE);
}
else
{
LLPipeline::setRenderHighlights(TRUE);
view->getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
}
LLPipeline::setRenderBeacons(TRUE);
getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
}
}
else if (name == "beacons")
{
LLPipeline::toggleRenderBeacons(NULL);
// Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
if (!LLPipeline::getRenderBeacons(NULL) &&
!LLPipeline::getRenderHighlights(NULL))
{
LLPipeline::setRenderHighlights(TRUE);
getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
}
}
}

3
indra/newview/llfloaterbeacons.h
View File

@@ -46,11 +46,10 @@ public:
// Needed to make the floater visibility toggle the beacons.
/*virtual*/ void open();
/*virtual*/ void close(bool app_quitting);
void onClickUICheck(LLUICtrl *ctrl);
private:
LLFloaterBeacons(const LLSD& seed);
static void onClickUICheck(LLUICtrl *ctrl, void* data);
};
#endif

123
indra/newview/llprogressview.cpp
View File

@@ -46,6 +46,7 @@
#include "llagent.h"
#include "llbutton.h"
#include "llcallbacklist.h"
#include "llfocusmgr.h"
#include "llprogressbar.h"
#include "llstartup.h"
@@ -55,28 +56,28 @@
#include "llappviewer.h"
#include "llweb.h"
#include "lluictrlfactory.h"
#include "llpanellogin.h"
LLProgressView* LLProgressView::sInstance = NULL;
S32 gStartImageWidth = 1;
S32 gStartImageHeight = 1;
const F32 FADE_IN_TIME = 1.f;
const std::string ANIMATION_FILENAME = "Login Sequence ";
const std::string ANIMATION_SUFFIX = ".jpg";
const F32 TOTAL_LOGIN_TIME = 10.f; // seconds, wild guess at time from GL context to actual world view
S32 gLastStartAnimationFrame = 0; // human-style indexing, first image = 1
const S32 ANIMATION_FRAMES = 1; //13;
const F32 FADE_TO_WORLD_TIME = 1.0f;
// XUI:translate
LLProgressView::LLProgressView(const std::string& name, const LLRect &rect)
: LLPanel(name, rect, FALSE),
mPercentDone( 0.f ),
mURLInMessage(false),
mMouseDownInActiveArea( false )
mMouseDownInActiveArea( false ),
mFadeToWorldTimer(),
mFadeFromLoginTimer(),
mStartupComplete(false)
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_progress.xml");
reshape(rect.getWidth(), rect.getHeight());
mFadeToWorldTimer.stop();
mFadeFromLoginTimer.stop();
}
BOOL LLProgressView::postBuild()
@@ -85,12 +86,13 @@ BOOL LLProgressView::postBuild()
mCancelBtn = getChild<LLButton>("cancel_btn");
mCancelBtn->setClickedCallback( boost::bind(&LLProgressView::onCancelButtonClicked) );
mFadeTimer.stop();
getChild<LLTextBox>("title_text")->setText(LLStringExplicit(LLAppViewer::instance()->getSecondLifeTitle()));
getChild<LLTextBox>("message_text")->setClickedCallback(boost::bind(&LLProgressView::onClickMessage, this));
// hidden initially, until we need it
setVisible(FALSE);
sInstance = this;
return TRUE;
}
@@ -98,6 +100,9 @@ BOOL LLProgressView::postBuild()
LLProgressView::~LLProgressView()
{
// Just in case something went wrong, make sure we deregister our idle callback.
gIdleCallbacks.deleteFunction(onIdle, this);
gFocusMgr.releaseFocusIfNeeded( this );
sInstance = NULL;
@@ -123,34 +128,44 @@ BOOL LLProgressView::handleKeyHere(KEY key, MASK mask)
return TRUE;
}
void LLProgressView::revealIntroPanel()
{
getParent()->sendChildToFront(this);
mFadeFromLoginTimer.start();
gIdleCallbacks.addFunction(onIdle, this);
}
void LLProgressView::setStartupComplete()
{
mStartupComplete = true;
mFadeFromLoginTimer.stop();
mFadeToWorldTimer.start();
}
void LLProgressView::setVisible(BOOL visible)
{
// hiding progress view
if (getVisible() && !visible)
{
mFadeTimer.start();
LLPanel::setVisible(FALSE);
}
else if (!getVisible() && visible)
// showing progress view
else if (visible && (!getVisible() || mFadeToWorldTimer.getStarted()))
{
gFocusMgr.setTopCtrl(this);
setFocus(TRUE);
mFadeTimer.stop();
mProgressTimer.start();
LLPanel::setVisible(visible);
}
mFadeToWorldTimer.stop();
LLPanel::setVisible(TRUE);
}
}
void LLProgressView::draw()
void LLProgressView::drawStartTexture(F32 alpha)
{
static LLTimer timer;
// Paint bitmap if we've got one
gGL.pushMatrix();
if (gStartTexture)
{
LLGLSUIDefault gls_ui;
gGL.getTexUnit(0)->bind(gStartTexture);
gGL.color4f(1.f, 1.f, 1.f, mFadeTimer.getStarted() ? clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, FADE_IN_TIME, 1.f, 0.f) : 1.f);
gGL.getTexUnit(0)->bind(gStartTexture.get());
gGL.color4f(1.f, 1.f, 1.f, alpha);
F32 image_aspect = (F32)gStartImageWidth / (F32)gStartImageHeight;
S32 width = getRect().getWidth();
S32 height = getRect().getHeight();
@@ -176,20 +191,51 @@ void LLProgressView::draw()
gl_rect_2d(getRect());
}
gGL.popMatrix();
}
// Handle fade-in animation
if (mFadeTimer.getStarted())
void LLProgressView::draw()
{
static LLTimer timer;
if (mFadeFromLoginTimer.getStarted())
{
F32 alpha = clamp_rescale(mFadeFromLoginTimer.getElapsedTimeF32(), 0.f, FADE_TO_WORLD_TIME, 0.f, 1.f);
LLViewDrawContext context(alpha);
drawStartTexture(alpha);
LLPanel::draw();
if (mFadeTimer.getElapsedTimeF32() > FADE_IN_TIME)
return;
}
// handle fade out to world view when we're asked to
if (mFadeToWorldTimer.getStarted())
{
// draw fading panel
F32 alpha = clamp_rescale(mFadeToWorldTimer.getElapsedTimeF32(), 0.f, FADE_TO_WORLD_TIME, 1.f, 0.f);
LLViewDrawContext context(alpha);
drawStartTexture(alpha);
LLPanel::draw();
// faded out completely - remove panel and reveal world
if (mFadeToWorldTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME )
{
gFocusMgr.removeTopCtrlWithoutCallback(this);
LLPanel::setVisible(FALSE);
mFadeToWorldTimer.stop();
// Fade is complete, release focus
gFocusMgr.releaseFocusIfNeeded( this );
// turn off panel that hosts intro so we see the world
setVisible(FALSE);
gStartTexture = NULL;
}
return;
}
drawStartTexture(1.0f);
// draw children
LLPanel::draw();
}
@@ -226,7 +272,10 @@ void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label)
// static
void LLProgressView::onCancelButtonClicked()
{
if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE)
// Quitting viewer here should happen only when "Quit" button is pressed while starting up.
// Check for startup state is used here instead of teleport state to avoid quitting when
// cancel is pressed while teleporting inside region (EXT-4911)
if (LLStartUp::getStartupState() < STATE_STARTED)
{
LLAppViewer::instance()->requestQuit();
}
@@ -265,3 +314,21 @@ void LLProgressView::onClickMessage(void* data)
}
}
}
// static
void LLProgressView::onIdle(void* user_data)
{
LLProgressView* self = (LLProgressView*) user_data;
// Close login panel on mFadeToWorldTimer expiration.
if (self->mFadeFromLoginTimer.getStarted() &&
self->mFadeFromLoginTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME)
{
self->mFadeFromLoginTimer.stop();
LLPanelLogin::close();
// Nothing to do anymore.
gIdleCallbacks.deleteFunction(onIdle, user_data);
}
}

12
indra/newview/llprogressview.h
View File

@@ -49,6 +49,7 @@ public:
BOOL postBuild();
/*virtual*/ void draw();
void drawStartTexture(F32 alpha);
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
@@ -60,6 +61,10 @@ public:
// Set it to NULL when you want to eliminate the message.
void setMessage(const std::string& msg);
void revealIntroPanel();
void setStartupComplete();
void setCancelButtonVisible(BOOL b, const std::string& label);
static void onCancelButtonClicked();
@@ -70,13 +75,14 @@ protected:
F32 mPercentDone;
std::string mMessage;
LLButton* mCancelBtn;
LLFrameTimer mFadeTimer;
LLFrameTimer mProgressTimer;
LLFrameTimer mFadeToWorldTimer;
LLFrameTimer mFadeFromLoginTimer;
LLRect mOutlineRect;
bool mMouseDownInActiveArea;
bool mStartupComplete;
bool mURLInMessage;
static LLProgressView* sInstance;
static void onIdle(void* user_data);
};
#endif // LL_LLPROGRESSVIEW_H

9
indra/newview/llstartup.cpp
View File

@@ -1097,7 +1097,7 @@ bool idle_startup()
LLURLSimString::setString( location );
*/
// END TODO
LLPanelLogin::close();
//LLPanelLogin::close();
}
//For HTML parsing in text boxes.
@@ -1151,6 +1151,7 @@ bool idle_startup()
gViewerWindow->setShowProgress(!gSavedSettings.getBOOL("AscentDisableLogoutScreens"));
gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));
gViewerWindow->revealIntroPanel();
// Poke the VFS, which could potentially block for a while if
// Windows XP is acting up
set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache"), LLStringUtil::null);
@@ -1796,9 +1797,6 @@ bool idle_startup()
handleCloudSettingsChanged(LLSD());
display_startup();
// Move the progress view in front of the UI
gViewerWindow->moveProgressViewToFront();
display_startup();
LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
display_startup();
@@ -2656,7 +2654,8 @@ bool idle_startup()
gViewerWindow->getWindow()->resetBusyCount();
gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL;
gViewerWindow->setShowProgress(FALSE);
gViewerWindow->setStartupComplete();
gViewerWindow->setProgressCancelButtonVisible(FALSE);
display_startup();

9
indra/newview/llviewermenu.cpp
View File

@@ -3356,15 +3356,6 @@ class LLAvatarGiveCard : public view_listener_t
}
};
void login_done(S32 which, void *user)
{
llinfos << "Login done " << which << llendl;
LLPanelLogin::close();
}
bool callback_leave_group(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotification::getSelectedOption(notification, response);

18
indra/newview/llviewerwindow.cpp
View File

@@ -1638,7 +1638,8 @@ LLViewerWindow::LLViewerWindow(
mResDirty(false),
//mStatesDirty(false), //Singu Note: No longer needed. State update is now in restoreGL.
mIsFullscreenChecked(false),
mCurrResolutionIndex(0)
mCurrResolutionIndex(0),
mProgressView(NULL)
{
LLNotificationChannel::buildChannel("VW_alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert"));
LLNotificationChannel::buildChannel("VW_alertmodal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal"));
@@ -2203,6 +2204,7 @@ void LLViewerWindow::initWorldUI_postLogin()
LLFloaterChatterBox::createInstance(LLSD());
}
mRootView->sendChildToFront(mProgressView);
}
// Destroy the UI
@@ -5144,6 +5146,13 @@ void LLViewerWindow::setup3DViewport(S32 x_offset, S32 y_offset)
glViewport(gGLViewport[0], gGLViewport[1], gGLViewport[2], gGLViewport[3]);
}
void LLViewerWindow::revealIntroPanel()
{
if (mProgressView)
{
mProgressView->revealIntroPanel();
}
}
void LLViewerWindow::setShowProgress(const BOOL show)
{
@@ -5153,12 +5162,11 @@ void LLViewerWindow::setShowProgress(const BOOL show)
}
}
void LLViewerWindow::moveProgressViewToFront()
void LLViewerWindow::setStartupComplete()
{
if (mProgressView && mRootView)
if (mProgressView)
{
mRootView->removeChild(mProgressView);
mRootView->addChild(mProgressView);
mProgressView->setStartupComplete();
}
}

3
indra/newview/llviewerwindow.h
View File

@@ -274,12 +274,13 @@ public:
void setShowProgress(const BOOL show);
BOOL getShowProgress() const;
void moveProgressViewToFront();
void setProgressString(const std::string& string);
void setProgressPercent(const F32 percent);
void setProgressMessage(const std::string& msg);
void setProgressCancelButtonVisible( BOOL b, const std::string& label = LLStringUtil::null );
LLProgressView *getProgressView() const;
void revealIntroPanel();
void setStartupComplete();
void updateObjectUnderCursor();

83
indra/newview/skins/default/xui/en-us/floater_beacons.xml
View File

@@ -3,23 +3,68 @@
width="250" height="255"
name="beacons" title="Beacons"
rect_control="FloaterBeaconsRect" control_name="ShowBeaconsFloater">
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="230" name="beacons_panel">
<check_box bottom_delta="-33" follows="left|top" left="0" name="always_on" label="Keep beacons when closing floater" control_name="keepbeacons" />
<check_box bottom_delta="-30" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
<check_box bottom_delta="-30" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
<check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="25"
mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">
Beacon Width:
</text>
<slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"
decimal_digits="0" increment="1" initial_val="1" left="16" min_val="1.0" max_val="16.0"
name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>
</panel>
<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="230" name="beacons_panel">
<check_box bottom_delta="-24" follows="left|top" left="0" control_name="BeaconsKeepVisible" label="Keep beacons when closing floater" name="always_on"/>
<check_box bottom_delta="-30" follows="left|top" control_name="renderbeacons" label="Render Beacons" name="beacons">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="renderhighlights" label="Render Highlights" name="highlights">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<text
type="string"
length="1"
bottom_delta="-20"
follows="left|top"
height="16"
left="20"
name="beacon_width_label"
width="128">
Beacon Width:
</text>
<slider
control_name="DebugBeaconLineWidth"
decimal_digits="0"
height="16"
increment="1"
initial_value="1"
max_val="16"
min_val="1"
name="beacon_width"
bottom_delta="-14"
width="180" />
<check_box bottom_delta="-22" follows="left|top" left="0" control_name="physicalbeacon" label="Physical Objects" name="physical">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="scriptsbeacon" label="Scripted Objects" name="scripted">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="scripttouchbeacon" label="Scripted Objects with Touch Only" name="touch_only">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="soundsbeacon" label="Sound Sources" name="sounds">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box bottom_delta="-20" follows="left|top" control_name="particlesbeacon" label="Particle Sources" name="particles">
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
<check_box
bottom_delta="-20"
follows="left|top"
control_name="moapbeacon"
height="16"
left="0"
label="Media sources"
name="moapbeacon" >
<check_box.commit_callback
function="Beacons.UICheck" />
</check_box>
</panel>
</floater>

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

@@ -65,7 +65,7 @@
bottom="-45"
left="0"
border_size="0"
mouse_opaque="true"
mouse_opaque="false"
orientation="horizontal">
<!-- outer layout_panels center the inner one -->
<layout_panel

14
indra/newview/skins/default/xui/en-us/panel_progress.xml
View File

@@ -2,15 +2,15 @@
<panel bottom="0" follows="left|bottom|right|top" height="768" left="0" name="login_progress_panel" width="1024" visible="true">
<layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom">
<layout_panel name="panel1" user_resize="false" min_width="10" width="150"/>
<layout_panel name="panel2" user_resize="false" min_width="640" width="640" height="768">
<layout_panel name="panel2" user_resize="false" min_width="640" width="724" height="768">
<layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="640" follows="left|right|top|bottom">
<layout_panel name="panel3" min_height="10" height="200" width="640"/>
<layout_panel name="panel4" min_height="250" height="250" width="640" auto_resize="false">
<icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="640" height="250" follows="left|right|bottom|top"/>
<text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<layout_panel name="panel3" min_height="10" height="200" width="724"/>
<layout_panel name="panel4" min_height="250" height="250" width="724" auto_resize="false">
<icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="724" height="250" follows="left|right|bottom|top"/>
<text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="724" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
<progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
<text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="600" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
<text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="700" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
</layout_panel>
<layout_panel name="panel5" min_width="10" height="200" width="640"/>
</layout_stack>

25
indra/newview/skins/default/xui/es/floater_beacons.xml
View File

@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="Balizas">
<panel name="beacons_panel">
<check_box name="always_on" label="Mantener balizas activas al cerrar"/>
<check_box name="touch_only" label="Solo Objetos con script de toque"/>
<check_box name="scripted" label="Objetos con Scripts"/>
<check_box name="physical" label="Objetos Materiales"/>
<check_box name="sounds" label="Fuentes de Sonidos"/>
<check_box name="particles" label="Fuentes de Partículas"/>
<check_box name="highlights" label="Activar los Realzados"/>
<check_box name="beacons" label="Activar Balizas"/>
<text name="beacon_width_label">
Ancho de la Baliza:
</text>
</panel>
<check_box label="Mantener balizas activas al cerrar" name="always_on"/>
<check_box label="Activar Balizas" name="beacons"/>
<check_box label="Activar los Realzados" name="highlights"/>
<text name="beacon_width_label">
Ancho de la Baliza:
</text>
<check_box label="Objetos Materiales" name="physical"/>
<check_box label="Objetos con Scripts" name="scripted"/>
<check_box label="Solo Objetos con script de toque" name="touch_only"/>
<check_box label="Fuentes de Sonidos" name="sounds"/>
<check_box label="Fuentes de Partículas" name="particles"/>
<check_box label="Fuentes de media" name="moapbeacon"/>
</panel>
</floater>

22
indra/newview/skins/default/xui/fr/floater_beacons.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="Balises">
<panel name="beacons_panel">
<check_box name="always_on" label="Keep beacons when closing floater"/>
<check_box name="touch_only" label="Objets scriptés avec &#x22;Toucher&#x22; uniquement"/>
<check_box name="scripted" label="Objets scriptés"/>
<check_box name="physical" label="Objets physiques"/>
<check_box name="sounds" label="Sources sonores"/>
<check_box name="particles" label="Sources de particules"/>
<check_box name="highlights" label="Mettre en surbrillance"/>
<check_box name="beacons" label="Montrer les balises"/>
<text name="beacon_width_label">
Largeur de la balise :
</text>
<check_box label="Montrer les balises" name="beacons"/>
<check_box label="Mettre en surbrillance" name="highlights"/>
<text name="beacon_width_label">
Largeur de la balise :
</text>
<check_box label="Objets physiques" name="physical"/>
<check_box label="Objets scriptés" name="scripted"/>
<check_box label="Objets scriptés avec &#x22;Toucher&#x22; uniquement" name="touch_only"/>
<check_box label="Sources sonores" name="sounds"/>
<check_box label="Sources des particules" name="particles"/>
<check_box label="Sources des médias" name="moapbeacon"/>
</panel>
</floater>

11
indra/newview/skins/default/xui/pt/floater_beacons.xml
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="Balizas">
<panel name="beacons_panel">
<check_box label="Objetos programados com toque apenas" name="touch_only"/>
<check_box label="Objetos programados" name="scripted"/>
<check_box label="Objetos físicos" name="physical"/>
<check_box label="Fontes de Som" name="sounds"/>
<check_box label="Fontes de Partículas" name="particles"/>
<check_box label="Renderização de Highlights" name="highlights"/>
<check_box label="Renderização de Balizas" name="beacons"/>
<text name="beacon_width_label">
Largura da Baliza
</text>
<check_box label="Objetos físicos" name="physical"/>
<check_box label="Objetos programados" name="scripted"/>
<check_box label="Objetos programados com toque apenas" name="touch_only"/>
<check_box label="Fontes de Som" name="sounds"/>
<check_box label="Fontes de Partículas" name="particles"/>
<check_box label="Fontes de mídia" name="moapbeacon"/>
</panel>
</floater>