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

FIRE-6340 & FIRE-6567 -Setting Bandwidth via quick preferences doesn't work and 

setting bandwidth via cmd_line - combined jira's because of way everything was
linked with the Preferences Panel.
Holy 2012-06-17 16:11:50 -04:00
parent d926c6586f
commit 07412a5665
8 changed files with 545 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15835,6 +15835,19 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<string>tp2</string>
</map>
<!--<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues-->
<key>FSCmdLineBandWidth</key>
<map>
<key>Comment</key>
<string>Change max. bandwidth quickly</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>bw</string>
</map>
<!--</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues-->
<key>FSWLParcelEnabled</key>
<map>
<key>Comment</key>

29
indra/newview/chatbar_as_cmdline.cpp
View File

@ -82,7 +82,7 @@
#include "llagentcamera.h"
#include "lggcontactsetsfloater.h"
#include "lltrans.h" //<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
void cmdline_printchat(std::string message);
void cmdline_rezplat(bool use_saved_value = true, F32 visual_radius = 30.0);
@ -515,6 +515,8 @@ bool cmd_line_chat(std::string revised_text, EChatType type, bool from_gesture)
static LLCachedControl<std::string> sFSCmdLineMedia(gSavedSettings, "FSCmdLineMedia");
static LLCachedControl<std::string> sFSCmdLineMusic(gSavedSettings, "FSCmdLineMusic");
static LLCachedControl<std::string> sFSCmdLineAutocorrect(gSavedSettings, "FSCmdLineAutocorrect");
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
static LLCachedControl<std::string> sFSCmdLineBandwidth(gSavedSettings, "FSCmdLineBandWidth");
if(sFSCmdLine)
{
@ -593,6 +595,31 @@ bool cmd_line_chat(std::string revised_text, EChatType type, bool from_gesture)
}
}
}
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
else if(command == std::string(sFSCmdLineBandwidth))
{
int band_width;
if(i >> band_width)
{
if ( band_width < 100 )
{
band_width = 100;
}
else if (band_width > 3000 )
{
band_width = 3000;
}
gSavedSettings.setF32("ThrottleBandwidthKBPS", band_width);
LLStringUtil::format_map_t args;
std::string bw_cmd_respond;
args["[VALUE]"] = llformat ("%d", band_width);
bw_cmd_respond = LLTrans::getString("FSCmdLineRSP", args);
cmdline_printchat(bw_cmd_respond);
return false;
}
}
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
#if 0
else if(command == std::string(sFSCmdLineMusic))
{

95
indra/newview/llfloaterpreference.cpp
View File

@ -130,7 +130,8 @@
const F32 MAX_USER_FAR_CLIP = 512.f;
const F32 MIN_USER_FAR_CLIP = 64.f;
const F32 BANDWIDTH_UPDATER_TIMEOUT = 0.5f;
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//const F32 BANDWIDTH_UPDATER_TIMEOUT = 0.5f;
//control value for middle mouse as talk2push button
const static std::string MIDDLE_MOUSE_CV = "MiddleMouse";
@ -1886,55 +1887,59 @@ static void updateBandwidthWarning()
}
// </FS:Zi>
static bool handleBandwidthChanged(const LLSD& newvalue)
{
gViewerThrottle.setMaxBandwidth((F32) newvalue.asReal());
updateBandwidthWarning(); // <FS:Zi> Add warning on high bandwidth setting
return true;
}
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//static bool handleBandwidthChanged(const LLSD& newvalue)
//{
// gViewerThrottle.setMaxBandwidth((F32) newvalue.asReal());
// updateBandwidthWarning(); // <FS:Zi> Add warning on high bandwidth setting
// return true;
//}
class LLPanelPreference::Updater : public LLEventTimer
{
//class LLPanelPreference::Updater : public LLEventTimer
//{
public:
//public:
typedef boost::function<bool(const LLSD&)> callback_t;
// typedef boost::function<bool(const LLSD&)> callback_t;
Updater(callback_t cb, F32 period)
:LLEventTimer(period),
mCallback(cb)
{
mEventTimer.stop();
}
// Updater(callback_t cb, F32 period)
// :LLEventTimer(period),
// mCallback(cb)
// {
// mEventTimer.stop();
// }
virtual ~Updater(){}
// virtual ~Updater(){}
void update(const LLSD& new_value)
{
mNewValue = new_value;
mEventTimer.start();
}
// void update(const LLSD& new_value)
// {
// mNewValue = new_value;
// mEventTimer.start();
// }
protected:
//protected:
BOOL tick()
{
mCallback(mNewValue);
mEventTimer.stop();
// BOOL tick()
// {
// mCallback(mNewValue);
// mEventTimer.stop();
return FALSE;
}
// return FALSE;
// }
private:
//private:
// LLSD mNewValue;
// callback_t mCallback;
//};
//---------------------------------------------------------------------------- */
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
LLSD mNewValue;
callback_t mCallback;
};
//----------------------------------------------------------------------------
static LLRegisterPanelClassWrapper<LLPanelPreference> t_places("panel_preference");
LLPanelPreference::LLPanelPreference()
: LLPanel(),
mBandWidthUpdater(NULL)
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//: LLPanel(),
//mBandWidthUpdater(NULL)
{
mCommitCallbackRegistrar.add("Pref.setControlFalse", boost::bind(&LLPanelPreference::setControlFalse,this, _2));
mCommitCallbackRegistrar.add("Pref.updateMediaAutoPlayCheckbox", boost::bind(&LLPanelPreference::updateMediaAutoPlayCheckbox, this, _1));
@ -2022,9 +2027,11 @@ BOOL LLPanelPreference::postBuild()
if (hasChild("max_bandwidth_layout"))
// </FS:Zi>
{
mBandWidthUpdater = new LLPanelPreference::Updater(boost::bind(&handleBandwidthChanged, _1), BANDWIDTH_UPDATER_TIMEOUT);
gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&LLPanelPreference::Updater::update, mBandWidthUpdater, _2));
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//mBandWidthUpdater = new LLPanelPreference::Updater(boost::bind(&handleBandwidthChanged, _1), BANDWIDTH_UPDATER_TIMEOUT);
//gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&LLPanelPreference::Updater::update, mBandWidthUpdater, _2));
updateBandwidthWarning(); // <FS:Zi> Add warning on high bandwidth setting
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
}
// <FS:Ansariel> Fix for visually broken browser choice radiobuttons
@ -2061,10 +2068,12 @@ BOOL LLPanelPreference::postBuild()
LLPanelPreference::~LLPanelPreference()
{
if (mBandWidthUpdater)
{
delete mBandWidthUpdater;
}
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//if (mBandWidthUpdater)
//{
// delete mBandWidthUpdater;
//}
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
}
void LLPanelPreference::apply()
{

24
indra/newview/llviewercontrol.cpp
View File

@ -74,6 +74,7 @@
#include "llcombobox.h"
#include "llstatusbar.h"
#include "llupdaterservice.h"
#include "lltrans.h" //<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
// [SL:KB] - Patch: Misc-Spellcheck | Checked: 2010-07-02 (Catznip-2.7.0a) | Added: Catznip-2.7.0a
#include "llhunspell.h"
// [/SL:KB]
@ -97,6 +98,9 @@ std::string gLastRunVersion;
extern BOOL gResizeScreenTexture;
extern BOOL gDebugGL;
extern BOOL gAuditTexture;
LLTimer throttle_timer;//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
void cmdline_printchat(std::string message);//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
////////////////////////////////////////////////////////////////////////////
// Listeners
@ -113,7 +117,23 @@ static bool handleRenderFarClipChanged(const LLSD& newvalue)
LLWorld::getInstance()->setLandFarClip(draw_distance);
return true;
}
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
static bool handleBandWidthChanged(const LLSD& newvalue)
{
F32 throttletimer = throttle_timer.getElapsedTimeF32();
if (throttletimer > 0.25f)
{
F32 bandwidth = (F32) newvalue.asReal();
gViewerThrottle.setMaxBandwidth((F32) bandwidth);
if ( gSavedSettings.getBOOL("BandwidthSettingTooHigh") )
{
cmdline_printchat(LLTrans::getString("FSCmdLineBWTooHigh"));
}
throttle_timer.reset();
}
return true;
}
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
static bool handleTerrainDetailChanged(const LLSD& newvalue)
{
LLDrawPoolTerrain::sDetailMode = newvalue.asInteger();
@ -676,6 +696,8 @@ void settings_setup_listeners()
{
gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2));
gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2));
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&handleBandWidthChanged, _2));
gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2));
gSavedSettings.getControl("OctreeStaticObjectSizeFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
gSavedSettings.getControl("OctreeDistanceFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));

4
indra/newview/llviewerthrottle.cpp
View File

@ -147,6 +147,10 @@ LLViewerThrottleGroup LLViewerThrottleGroup::operator-(const LLViewerThrottleGro
void LLViewerThrottleGroup::sendToSim() const
{
llinfos << "Sending throttle settings, total BW " << mThrottleTotal << llendl;
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
S32 newBandwidth=(S32) gSavedSettings.getF32("ThrottleBandwidthKBPS");
gSavedSettings.setBOOL("BandwidthSettingTooHigh",newBandwidth>1500);
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_AgentThrottle);

16
indra/newview/skins/default/xui/en/floater_quickprefs.xml
View File

@ -52,10 +52,9 @@
name="DrawDistance"
top_delta="-2"
width="150"
label_width="3"/>
<!-- [FS:WF] Removing max bandwidth setting for now - FIRE-6340 -->
<!-- <text
label_width="3"/>
<!--<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues -->
<text
type="string"
length="1"
follows="left|top"
@ -78,14 +77,13 @@
increment="100"
initial_value="500"
layout="topleft"
left_delta="100"
max_val="1500"
left_delta="99"
max_val="3000"
min_val="100"
name="max_bandwidth"
top_delta="-2"
width="149" />
-->
width="144" />
<!--</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues -->
<text
type="string"
length="1"

776
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -790,373 +790,423 @@
tool_tip="Change the scale of the shape used for the Phoenix Shaped Beam" />
</panel>
<!--<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues-->
<!--CmdLine1-->
<panel
top_pad="5"
bottom="-1"
left="1"
right="-1"
follows="all"
label="CmdLine 1"
name="tab1-3" >
<check_box
top="10"
follows="left|top"
height="16"
label="Enable usage of chat bar as a command line"
left="5"
name="chat_cmd_toggle"
width="270"
control_name="FSCmdLine"/>.
<!--calc-->
<text
top="25"
follows="left|top"
height="16"
left="10"
name="FSCmdLineCalc_txt"
width="250">
Calc. expressions (usage: cmd SIN(2+2))
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineCalc"
tool_tip=""
control_name="FSCmdLineCalc"
width="200"/>
<!--autocorrect-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineAutocorrect_txt"
width="250">
Add autocorrect word(cmd list|bad|good)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineAutocorrect"
tool_tip=""
control_name="FSCmdLineAutocorrect"
width="200"/>
<!--drawdistance-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineDrawDistance_txt"
width="250">
Change Draw Dist (usage: cmd meters)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineDrawDistance"
tool_tip=""
control_name="FSCmdLineDrawDistance"
width="200"/>
<!--bandwidth-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineBandWidth_txt"
width="250">
Max. Bandwidth (usage: cmd kbps)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineBandWidth"
tool_tip=""
control_name="FSCmdLineBandWidth"
width="200"/>
<!--rezplat-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineRezPlatform_txt"
width="250">
Rez a platform (usage: cmd 0 - 30)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineRezPlatform"
tool_tip=""
control_name="FSCmdLineRezPlatform"
width="200"/>
<slider
top_pad="4"
name="FSCmdLinePlatformSize"
control_name="FSCmdLinePlatformSize"
decimal_digits="1"
follows="left|top"
height="18"
increment="0.5"
initial_val="5"
label="Width"
label_width="30"
max_val="30"
min_val="5"
show_text="true"
width="200"
auto_resize="false"
tool_tip="How big do you want the platform to appear to be?"/>
<!--CmdLine-->
<panel
top_pad="5"
bottom="-1"
left="1"
right="-1"
follows="all"
label="CmdLine"
name="tab1-3" >
<view_border
bevel_style="none"
border_thickness="1"
top="25"
left="240"
bottom="-25"
width="0"
follows="top|left|bottom"
name="EmDivisor"/>
<!--key2name-->
<text
top="25"
follows="left|top"
height="16"
left_delta="10"
name="FSCmdLineKeyToName_txt"
width="250">
Get avatar name from key (usage: cmd key)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineKeyToName"
tool_tip=""
control_name="FSCmdLineKeyToName"
width="200"/>
<!--cao-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineAO_txt"
width="250">
Turn AO on/off (usage: cmd on/off)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineAO"
tool_tip=""
control_name="FSCmdLineAO"
width="200"/>
<!--clrchat-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineClearChat_txt"
width="250">
Clear the chat history (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
name="FSCmdLineClearChat"
control_name="FSCmdLineClearChat"
width="200"/>
<!--media-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineMedia_txt"
width="250">
Set the media url (usage: cmd url type)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
tool_tip="Sets and plays your media stream to the entered url"
name="FSCmdLineMedia"
control_name="FSCmdLineMedia"
width="200"/>
<!--music-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineMusic_txt"
width="250">
Set the music stream url (usage: cmd url)
</text>
<line_editor
top_pad="0"
enabled="false"
follows="left|top"
height="20"
max_length="256"
tool_tip="sets and plays your music stream to the entered url"
name="FSCmdLineMusic"
control_name="FSCmdLineMusic"
width="200"/>
</panel>
<check_box
top="10"
follows="left|top"
height="16"
label="Enable usage of chat bar as a command line"
left="5"
name="chat_cmd_toggle"
width="270"
control_name="FSCmdLine"/>
<text
top="25"
follows="left|top"
height="16"
left="10"
name="FSCmdLinePos_txt"
width="250">
Teleport within sim (usage: cmd x y z)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLinePos"
tool_tip=""
control_name="FSCmdLinePos"
width="200"/>
<!--CmdLine2-->
<panel
top_pad="5"
bottom="-1"
left="1"
right="-1"
follows="all"
label="CmdLine 2"
name="tab1-3" >
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineGround_txt"
width="250">
Teleport to ground (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineGround"
tool_tip=""
control_name="FSCmdLineGround"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineHeight_txt"
width="250">
Teleport to altitude (usage: cmd z)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineHeight"
tool_tip=""
control_name="FSCmdLineHeight"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineTeleportHome_txt"
width="250">
Teleport home (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineTeleportHome"
tool_tip=""
control_name="FSCmdLineTeleportHome"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineRezPlatform_txt"
width="250">
Rez a platform (usage: cmd 0 - 30)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineRezPlatform"
tool_tip=""
control_name="FSCmdLineRezPlatform"
width="200"/>
<slider
top_pad="4"
name="FSCmdLinePlatformSize"
control_name="FSCmdLinePlatformSize"
decimal_digits="1"
follows="left|top"
height="18"
increment="0.5"
initial_val="5"
label="Width"
label_width="30"
max_val="30"
min_val="5"
show_text="true"
width="200"
auto_resize="false"
tool_tip="How big do you want the platform to appear to be?"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineMapTo_txt"
width="250">
Teleport to sim x (usage: cmd simname)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineMapTo"
tool_tip=""
control_name="FSCmdLineMapTo"
width="200"/>
<check_box
top_pad="4"
follows="left|top"
height="16"
label="Use same position between sims"
name="toggle"
width="270"
control_name="FSCmdLineMapToKeepPos"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineCalc_txt"
width="250">
Calc. expressions (usage: cmd SIN(2+2))
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineCalc"
tool_tip=""
control_name="FSCmdLineCalc"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineAutocorrect_txt"
width="250">
Add autocorrect word(cmd list|bad|good)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineAutocorrect"
tool_tip=""
control_name="FSCmdLineAutocorrect"
width="200"/>
<view_border
bevel_style="none"
border_thickness="1"
top="25"
left="240"
bottom="-25"
width="0"
follows="top|left|bottom"
name="EmDivisor"/>
<text
top="25"
follows="left|top"
height="16"
left_delta="10"
name="FSCmdLineDrawDistance_txt"
width="250">
Change Draw Distance (usage: cmd meters)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineDrawDistance"
tool_tip=""
control_name="FSCmdLineDrawDistance"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdTeleportToCam_txt"
width="250">
Teleport to cam position (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdTeleportToCam"
tool_tip=""
control_name="FSCmdTeleportToCam"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineKeyToName_txt"
width="250">
Get avatar name from key (usage: cmd key)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineKeyToName"
tool_tip=""
control_name="FSCmdLineKeyToName"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineOfferTp_txt"
width="250">
Offer teleport to avatar (usage: cmd key)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineOfferTp"
tool_tip=""
control_name="FSCmdLineOfferTp"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineTP2_txt"
width="250">
Teleport to avatar (usage: cmd name)
</text>
<line_editor
top_pad="0"
enabled="false"
follows="left|top"
height="20"
max_length="256"
tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
name="FSCmdLineTP2"
control_name="FSCmdLineTP2"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineAO_txt"
width="250">
Turn AO on/off (usage: cmd on/off)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineAO"
tool_tip=""
control_name="FSCmdLineAO"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineClearChat_txt"
width="250">
Clear the chat history (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
name="FSCmdLineClearChat"
control_name="FSCmdLineClearChat"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineMedia_txt"
width="250">
Set the media url (usage: cmd url type)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
tool_tip="Sets and plays your media stream to the entered url"
name="FSCmdLineMedia"
control_name="FSCmdLineMedia"
width="200"/>
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineMusic_txt"
width="250">
Set the music stream url (usage: cmd url)
</text>
<line_editor
top_pad="0"
enabled="false"
follows="left|top"
height="20"
max_length="256"
tool_tip="sets and plays your music stream to the entered url"
name="FSCmdLineMusic"
control_name="FSCmdLineMusic"
width="200"/>
</panel>
<check_box
top="10"
follows="left|top"
height="16"
label="Enable usage of chat bar as a command line"
left="5"
name="chat_cmd_toggle"
width="270"
control_name="FSCmdLine"/>
<!--gtp-->
<text
top="25"
follows="left|top"
height="16"
left="10"
name="FSCmdLinePos_txt"
width="250">
Teleport within sim (usage: cmd x y z)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLinePos"
tool_tip=""
control_name="FSCmdLinePos"
width="200"/>
<!--flr-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineGround_txt"
width="250">
Teleport to ground (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineGround"
tool_tip=""
control_name="FSCmdLineGround"
width="200"/>
<!--gth-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineHeight_txt"
width="250">
Teleport to altitude (usage: cmd z)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineHeight"
tool_tip=""
control_name="FSCmdLineHeight"
width="200"/>
<!--mapto-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineMapTo_txt"
width="250">
Teleport to sim x (usage: cmd simname)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineMapTo"
tool_tip=""
control_name="FSCmdLineMapTo"
width="200"/>
<check_box
top_pad="4"
follows="left|top"
height="16"
label="Use same position between sims"
name="toggle"
width="270"
control_name="FSCmdLineMapToKeepPos"/>
<view_border
bevel_style="none"
border_thickness="1"
top="25"
left="240"
bottom="-25"
width="0"
follows="top|left|bottom"
name="EmDivisor"/>
<!--tp2cam-->
<text
top="25"
follows="left|top"
height="16"
left_delta="10"
name="FSCmdTeleportToCam_txt"
width="250">
Teleport to cam position (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdTeleportToCam"
tool_tip=""
control_name="FSCmdTeleportToCam"
width="200"/>
<!--offertp-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineOfferTp_txt"
width="250">
Offer teleport to avatar (usage: cmd key)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineOfferTp"
tool_tip=""
control_name="FSCmdLineOfferTp"
width="200"/>
<!--tp2-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineTP2_txt"
width="250">
Teleport to avatar (usage: cmd name)
</text>
<line_editor
top_pad="0"
enabled="false"
follows="left|top"
height="20"
max_length="256"
tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
name="FSCmdLineTP2"
control_name="FSCmdLineTP2"
width="200"/>
<!--tphome-->
<text
top_pad="5"
follows="left|top"
height="16"
name="FSCmdLineTeleportHome_txt"
width="250">
Teleport home (usage: cmd)
</text>
<line_editor
top_pad="0"
follows="left|top"
height="20"
max_length="256"
name="FSCmdLineTeleportHome"
tool_tip=""
control_name="FSCmdLineTeleportHome"
width="200"/>
</panel>
<!--</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues-->
<!--Windlight-->
<panel

5
indra/newview/skins/default/xui/en/strings.xml
View File

@ -4030,4 +4030,9 @@ Try enclosing path to the editor with double quotes.
<string name="UnknownRegion">(unknown region)</string>
<string name="UnknownPosition">(unknown position)</string>
<!-- CmdLine Response Strings-->
<!--<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues-->
<string name="FSCmdLineRSP">Maximum Bandwidth Set To: [VALUE]kbps.</string>
<string name="FSCmdLineBWTooHigh">We strongly advise not to set the Bandwidth over 1500 kbps.</string>
<!--</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues-->
</strings>