diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index a73ebf4e06f9dc7a82c9773902e41ac024e70625..7cb8987879a76bfd8d90b3673d0920072262567e 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -72,8 +72,6 @@ LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed)
BOOL LLFloaterBulkPermission::postBuild()
{
-// childSetAction("help", onHelpBtn, this); // this is not in use
-
return TRUE;
}
@@ -157,12 +155,6 @@ void LLFloaterBulkPermission::onApplyBtn()
doApply();
}
-// angela -- this is not in use
-//void LLFloaterBulkPermission::onHelpBtn(void* user_data)
-//{
-// LLNotifications::instance().add("HelpBulkPermission");
-//}
-
void LLFloaterBulkPermission::onCloseBtn()
{
closeFloater();
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index c34e4413ccc94ed412f871be3de21f58b615af0c..31f4f5c3e169abf88556776b73872c523db13b82 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -79,7 +79,6 @@ class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener
U8 key,
bool is_new);
-// static void onHelpBtn(void* user_data);
void onCloseBtn();
void onApplyBtn();
void onCommitCopy();
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp
index 7f3b988dfe2cc0a540e02bf92cd1d752ef38bff7..48d552022f981e33f07e3e298163183a8e321cc7 100644
--- a/indra/newview/llfloaterdaycycle.cpp
+++ b/indra/newview/llfloaterdaycycle.cpp
@@ -105,20 +105,8 @@ LLFloaterDayCycle::~LLFloaterDayCycle()
{
}
-void LLFloaterDayCycle::onClickHelp(std::string xml_alert)
-{
- LLNotifications::instance().add(contextualNotification(xml_alert));
-}
-
-void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
- getChild<LLButton>(name)->setClickedCallback(boost::bind(&LLFloaterDayCycle::onClickHelp, this, xml_alert));
-}
-
void LLFloaterDayCycle::initCallbacks(void)
{
- initHelpBtn("WLDayCycleHelp", "HelpDayCycle");
-
// WL Day Cycle
getChild<LLUICtrl>("WLTimeSlider")->setCommitCallback(boost::bind(&LLFloaterDayCycle::onTimeSliderMoved, this, _1));
getChild<LLUICtrl>("WLDayCycleKeys")->setCommitCallback(boost::bind(&LLFloaterDayCycle::onKeyTimeMoved, this, _1));
diff --git a/indra/newview/llfloaterdaycycle.h b/indra/newview/llfloaterdaycycle.h
index 43c347d4f21d14bae9f8c4f2a4e2cb5093c8610a..c250902b6566487ad68048674013fa12f807b1c4 100644
--- a/indra/newview/llfloaterdaycycle.h
+++ b/indra/newview/llfloaterdaycycle.h
@@ -59,9 +59,6 @@ class LLFloaterDayCycle : public LLFloater
LLFloaterDayCycle(const LLSD& key);
virtual ~LLFloaterDayCycle();
/*virtual*/ BOOL postBuild();
- /// help button stuff
- void onClickHelp(std::string xml_alert);
- void initHelpBtn(const std::string& name, const std::string& xml_alert);
/// initialize all
void initCallbacks(void);
diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp
index a520df36dec3e461e5f039f994fef903c0ec19b0..2fffa6eece2bd366576f432d28efcd5cc823a805 100644
--- a/indra/newview/llfloaterenvsettings.cpp
+++ b/indra/newview/llfloaterenvsettings.cpp
@@ -70,10 +70,6 @@ BOOL LLFloaterEnvSettings::postBuild()
syncMenu();
return TRUE;
}
-void LLFloaterEnvSettings::onClickHelp()
-{
- LLNotifications::instance().add(contextualNotification("EnvSettingsHelpButton"));
-}
void LLFloaterEnvSettings::initCallbacks(void)
{
@@ -89,10 +85,8 @@ void LLFloaterEnvSettings::initCallbacks(void)
getChild<LLUICtrl>("EnvAdvancedSkyButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onOpenAdvancedSky, this));
getChild<LLUICtrl>("EnvAdvancedWaterButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onOpenAdvancedWater, this));
getChild<LLUICtrl>("EnvUseEstateTimeButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onUseEstateTime, this));
- getChild<LLUICtrl>("EnvSettingsHelpButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onClickHelp, this));
}
-
// menu maintenance functions
void LLFloaterEnvSettings::syncMenu()
diff --git a/indra/newview/llfloaterenvsettings.h b/indra/newview/llfloaterenvsettings.h
index 083e3636d1b6e3d8c6268cf5e4c7e246d820b12a..02bc5021207f0773380e4d475e1b527c4dcac830 100644
--- a/indra/newview/llfloaterenvsettings.h
+++ b/indra/newview/llfloaterenvsettings.h
@@ -53,9 +53,6 @@ class LLFloaterEnvSettings : public LLFloater
/// initialize all the callbacks for the menu
void initCallbacks(void);
- /// callback for the menus help button
- void onClickHelp();
-
/// handle if time of day is changed
void onChangeDayTime(LLUICtrl* ctrl);
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index 9947cdc2173c02f882d8f3ff00ce524a23c7940d..31b494b590d0c1581a4c4cbf233b694d64f9677a 100644
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -59,12 +59,6 @@ LLFloaterHardwareSettings::~LLFloaterHardwareSettings()
{
}
-void LLFloaterHardwareSettings::onClickHelp(void* data)
-{
- const char* xml_alert = "HardwareSettingsHelpButton";
- LLNotifications::instance().add(xml_alert);
-}
-
void LLFloaterHardwareSettings::initCallbacks(void)
{
}
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
index 3f19d89cbbbc7ed78965bf1410a5ec02642742db..ef0b0c905e027ed324d5c5e3b2a453a1aaf81b7e 100644
--- a/indra/newview/llfloaterhardwaresettings.h
+++ b/indra/newview/llfloaterhardwaresettings.h
@@ -50,9 +50,6 @@ class LLFloaterHardwareSettings : public LLFloater
/// initialize all the callbacks for the menu
void initCallbacks(void);
- /// callback for the menus help button
- static void onClickHelp(void* data);
-
/// OK button
static void onBtnOK( void* userdata );
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index bdf9842b015ec8288cf50389062d7476d5626533..0711e650b2dddaf50a9fdafa22f4473bfa6aa947 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -1743,7 +1743,6 @@ LLPanelLandOptions::LLPanelLandOptions(LLParcelSelectionHandle& parcel)
mClearBtn(NULL),
mMatureCtrl(NULL),
mPushRestrictionCtrl(NULL),
- mPublishHelpButton(NULL),
mParcel(parcel)
{
}
@@ -1812,14 +1811,9 @@ BOOL LLPanelLandOptions::postBuild()
mMatureCtrl = getChild<LLCheckBoxCtrl>( "MatureCheck");
childSetCommitCallback("MatureCheck", onCommitAny, this);
- mPublishHelpButton = getChild<LLButton>("?");
- mPublishHelpButton->setClickedCallback(onClickPublishHelp, this);
-
if (gAgent.wantsPGOnly())
{
// Disable these buttons if they are PG (Teen) users
- mPublishHelpButton->setVisible(FALSE);
- mPublishHelpButton->setEnabled(FALSE);
mMatureCtrl->setVisible(FALSE);
mMatureCtrl->setEnabled(FALSE);
}
@@ -1912,7 +1906,6 @@ void LLPanelLandOptions::refresh()
mClearBtn->setEnabled(FALSE);
mMatureCtrl->setEnabled(FALSE);
- mPublishHelpButton->setEnabled(FALSE);
}
else
{
@@ -1988,13 +1981,9 @@ void LLPanelLandOptions::refresh()
mSetBtn->setEnabled( can_change_landing_point );
mClearBtn->setEnabled( can_change_landing_point );
- mPublishHelpButton->setEnabled( can_change_identity );
-
if (gAgent.wantsPGOnly())
{
// Disable these buttons if they are PG (Teen) users
- mPublishHelpButton->setVisible(FALSE);
- mPublishHelpButton->setEnabled(FALSE);
mMatureCtrl->setVisible(FALSE);
mMatureCtrl->setEnabled(FALSE);
}
@@ -2247,28 +2236,6 @@ void LLPanelLandOptions::onClickClear(void* userdata)
self->refresh();
}
-// static
-void LLPanelLandOptions::onClickPublishHelp(void*)
-{
- LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
- LLParcel *parcel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection()->getParcel();
- llassert(region); // Region should never be null.
-
- bool can_change_identity = region && parcel ?
- LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_IDENTITY) &&
- ! (region->getRegionFlags() & REGION_FLAGS_BLOCK_PARCEL_SEARCH) : false;
-
- if(! can_change_identity)
- {
- LLNotifications::instance().add("ClickPublishHelpLandDisabled");
- }
- else
- {
- LLNotifications::instance().add("ClickPublishHelpLand");
- }
-}
-
-
//---------------------------------------------------------------------------
// LLPanelLandAccess
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 749c3951477b7df1004884bf775f2f0e4df26e21..f7fb978c2a1d318c106e96e70092a121c635ec18 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -320,7 +320,6 @@ class LLPanelLandOptions
static void onCommitAny(LLUICtrl* ctrl, void *userdata);
static void onClickSet(void* userdata);
static void onClickClear(void* userdata);
- static void onClickPublishHelp(void*);
private:
LLCheckBoxCtrl* mCheckEditObjects;
@@ -345,7 +344,6 @@ class LLPanelLandOptions
LLCheckBoxCtrl *mMatureCtrl;
LLCheckBoxCtrl *mPushRestrictionCtrl;
- LLButton *mPublishHelpButton;
LLSafeHandle<LLParcelSelection>& mParcel;
};
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 8b3391726a7fab80e84b21a74ed38d2f7f666027..f65897fc33bf4a3b678d7de72d47ee19a59e261c 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -339,7 +339,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.ClickDisablePopup", boost::bind(&LLFloaterPreference::onClickDisablePopup, this));
mCommitCallbackRegistrar.add("Pref.LogPath", boost::bind(&LLFloaterPreference::onClickLogPath, this));
mCommitCallbackRegistrar.add("Pref.Logging", boost::bind(&LLFloaterPreference::onCommitLogging, this));
- mCommitCallbackRegistrar.add("Pref.OpenHelp", boost::bind(&LLFloaterPreference::onOpenHelp, this));
mCommitCallbackRegistrar.add("Pref.UpdateMeterText", boost::bind(&LLFloaterPreference::updateMeterText, this, _1));
mCommitCallbackRegistrar.add("Pref.HardwareSettings", boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this));
mCommitCallbackRegistrar.add("Pref.HardwareDefaults", boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
@@ -608,12 +607,6 @@ void LLFloaterPreference::onBtnOK()
LLPanelLogin::refreshLocation( false );
}
-void LLFloaterPreference::onOpenHelp()
-{
- const char* xml_alert = "GraphicsPreferencesHelp";
- LLNotifications::instance().add(this->contextualNotification(xml_alert));
-}
-
// static
void LLFloaterPreference::onBtnApply( )
{
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 34723b8c7e3c2e480f476d4d63eec0e8b3773f2d..b1ad0348c0de2b60c8ab16fa91923ff365271eaf 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -84,7 +84,6 @@ class LLFloaterPreference : public LLFloater
void onBtnOK();
void onBtnCancel();
void onBtnApply();
- void onOpenHelp();
// void onClickClearCache();
void onClickBrowserClearCache();
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 11544f5b7b58780180ce9022df5bd14c7ac5c5cc..56646196fb2d78d32bc846b5035259ee8c25bb00 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -544,16 +544,6 @@ void LLPanelRegionInfo::initCtrl(const std::string& name)
getChild<LLUICtrl>(name)->setCommitCallback(boost::bind(&LLPanelRegionInfo::onChangeAnything, this));
}
-void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
- getChild<LLUICtrl>(name)->setCommitCallback(boost::bind(&LLPanelRegionInfo::onClickHelp, this, xml_alert));
-}
-
-void LLPanelRegionInfo::onClickHelp(std::string xml_alert)
-{
- LLNotifications::instance().add(xml_alert);
-}
-
/////////////////////////////////////////////////////////////////////////////
// LLPanelRegionGeneralInfo
//
@@ -589,17 +579,6 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
initCtrl("restrict_pushobject");
initCtrl("block_parcel_search_check");
- initHelpBtn("terraform_help", "HelpRegionBlockTerraform");
- initHelpBtn("fly_help", "HelpRegionBlockFly");
- initHelpBtn("damage_help", "HelpRegionAllowDamage");
- initHelpBtn("agent_limit_help", "HelpRegionAgentLimit");
- initHelpBtn("object_bonus_help", "HelpRegionObjectBonus");
- initHelpBtn("access_help", "HelpRegionMaturity");
- initHelpBtn("restrict_pushobject_help", "HelpRegionRestrictPushObject");
- initHelpBtn("land_resell_help", "HelpRegionLandResell");
- initHelpBtn("parcel_changes_help", "HelpParcelChanges");
- initHelpBtn("parcel_search_help", "HelpRegionSearch");
-
childSetAction("kick_btn", onClickKick, this);
childSetAction("kick_all_btn", onClickKickAll, this);
childSetAction("im_btn", onClickMessage, this);
@@ -809,13 +788,6 @@ BOOL LLPanelRegionDebugInfo::postBuild()
initCtrl("disable_collisions_check");
initCtrl("disable_physics_check");
- initHelpBtn("disable_scripts_help", "HelpRegionDisableScripts");
- initHelpBtn("disable_collisions_help", "HelpRegionDisableCollisions");
- initHelpBtn("disable_physics_help", "HelpRegionDisablePhysics");
- initHelpBtn("top_colliders_help", "HelpRegionTopColliders");
- initHelpBtn("top_scripts_help", "HelpRegionTopScripts");
- initHelpBtn("restart_help", "HelpRegionRestart");
-
childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
childSetAction("return_btn", onClickReturn, this);
childSetAction("top_colliders_btn", onClickTopColliders, this);
@@ -1182,15 +1154,6 @@ BOOL LLPanelRegionTerrainInfo::postBuild()
{
LLPanelRegionInfo::postBuild();
- initHelpBtn("water_height_help", "HelpRegionWaterHeight");
- initHelpBtn("terrain_raise_help", "HelpRegionTerrainRaise");
- initHelpBtn("terrain_lower_help", "HelpRegionTerrainLower");
- initHelpBtn("upload_raw_help", "HelpRegionUploadRaw");
- initHelpBtn("download_raw_help", "HelpRegionDownloadRaw");
- initHelpBtn("use_estate_sun_help", "HelpRegionUseEstateSun");
- initHelpBtn("fixed_sun_help", "HelpRegionFixedSun");
- initHelpBtn("bake_terrain_help", "HelpRegionBakeTerrain");
-
initCtrl("water_height_spin");
initCtrl("terrain_raise_spin");
initCtrl("terrain_lower_spin");
@@ -2103,20 +2066,6 @@ BOOL LLPanelEstateInfo::postBuild()
getChild<LLUICtrl>("abuse_email_address")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeAnything, this));
getChild<LLLineEditor>("abuse_email_address")->setKeystrokeCallback(onChangeText, this);
- initHelpBtn("estate_manager_help", "HelpEstateEstateManager");
- initHelpBtn("use_global_time_help", "HelpEstateUseGlobalTime");
- initHelpBtn("fixed_sun_help", "HelpEstateFixedSun");
- initHelpBtn("WLEditSkyHelp", "HelpEditSky");
- initHelpBtn("WLEditDayCycleHelp", "HelpEditDayCycle");
-
- initHelpBtn("externally_visible_help", "HelpEstateExternallyVisible");
- initHelpBtn("allow_direct_teleport_help", "HelpEstateAllowDirectTeleport");
- initHelpBtn("allow_resident_help", "HelpEstateAllowResident");
- initHelpBtn("allow_group_help", "HelpEstateAllowGroup");
- initHelpBtn("ban_resident_help", "HelpEstateBanResident");
- initHelpBtn("abuse_email_address_help", "HelpEstateAbuseEmailAddress");
- initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
-
// set up the use global time checkbox
getChild<LLUICtrl>("use_global_time_check")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeUseGlobalTime, this));
getChild<LLUICtrl>("fixed_sun_check")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeFixedSun, this));
@@ -2694,7 +2643,6 @@ bool LLPanelEstateCovenant::estateUpdate(LLMessageSystem* msg)
// virtual
BOOL LLPanelEstateCovenant::postBuild()
{
- initHelpBtn("covenant_help", "HelpEstateCovenant");
mEstateNameText = getChild<LLTextBox>("estate_name_text");
mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");
mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 95833af8a107f3bf9c7c8e4a5c6468a421260073..4958243d5bd1e6ba30e761f1b39b0da75a986227 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -125,10 +125,6 @@ class LLPanelRegionInfo : public LLPanel
protected:
void initCtrl(const std::string& name);
- void initHelpBtn(const std::string& name, const std::string& xml_alert);
-
- // Callback for all help buttons, data is name of XML alert to show.
- void onClickHelp(std::string xml_alert);
// Returns TRUE if update sent and apply button should be
// disabled.
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp
index 72c82c178b6f6e0fb714775638b03044abb7ce75..a0fe42bf61763ed48f2c220c6bd64fdb94c8fa52 100644
--- a/indra/newview/llfloaterwater.cpp
+++ b/indra/newview/llfloaterwater.cpp
@@ -110,23 +110,6 @@ BOOL LLFloaterWater::postBuild()
}
void LLFloaterWater::initCallbacks(void) {
- // help buttons
- initHelpBtn("WaterFogColorHelp", "HelpWaterFogColor");
- initHelpBtn("WaterFogDensityHelp", "HelpWaterFogDensity");
- initHelpBtn("WaterUnderWaterFogModHelp", "HelpUnderWaterFogMod");
- initHelpBtn("WaterGlowHelp", "HelpWaterGlow");
- initHelpBtn("WaterNormalScaleHelp", "HelpWaterNormalScale");
- initHelpBtn("WaterFresnelScaleHelp", "HelpWaterFresnelScale");
- initHelpBtn("WaterFresnelOffsetHelp", "HelpWaterFresnelOffset");
-
- initHelpBtn("WaterBlurMultiplierHelp", "HelpWaterBlurMultiplier");
- initHelpBtn("WaterScaleBelowHelp", "HelpWaterScaleBelow");
- initHelpBtn("WaterScaleAboveHelp", "HelpWaterScaleAbove");
-
- initHelpBtn("WaterNormalMapHelp", "HelpWaterNormalMap");
- initHelpBtn("WaterWave1Help", "HelpWaterWave1");
- initHelpBtn("WaterWave2Help", "HelpWaterWave2");
-
LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
getChild<LLUICtrl>("WaterFogColor")->setCommitCallback(boost::bind(&LLFloaterWater::onWaterFogColorMoved, this, _1, ¶m_mgr->mFogColor));
@@ -173,16 +156,6 @@ void LLFloaterWater::initCallbacks(void) {
getChild<LLUICtrl>("WaterNormalMap")->setCommitCallback(boost::bind(&LLFloaterWater::onNormalMapPicked, this, _1));
}
-void LLFloaterWater::onClickHelp(std::string xml_alert)
-{
- LLNotifications::instance().add(contextualNotification(xml_alert));
-}
-
-void LLFloaterWater::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
- getChild<LLButton>(name)->setClickedCallback(boost::bind(&LLFloaterWater::onClickHelp, this, xml_alert));
-}
-
bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& response)
{
std::string text = response["message"].asString();
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h
index 08c630c69e3e45bb27a6af27455a4120f2919bc5..0ea2436dbea4a5e1bfb8b41be5d7e082051cf6d7 100644
--- a/indra/newview/llfloaterwater.h
+++ b/indra/newview/llfloaterwater.h
@@ -59,10 +59,6 @@ class LLFloaterWater : public LLFloater
/// initialize all
void initCallbacks(void);
- // help button stuff
- void onClickHelp(std::string xml_alert);
- void initHelpBtn(const std::string& name, const std::string& xml_alert);
-
bool newPromptCallback(const LLSD& notification, const LLSD& response);
/// general purpose callbacks for dealing with color controllers
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index 02979acdd72a291a1f2b0c8b9ee02f0f56fae83e..60494f3cce4c88609ff22fd10db54dccc3023a78 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -119,36 +119,6 @@ BOOL LLFloaterWindLight::postBuild()
}
void LLFloaterWindLight::initCallbacks(void) {
- // help buttons
- initHelpBtn("WLBlueHorizonHelp", "HelpBlueHorizon");
- initHelpBtn("WLHazeHorizonHelp", "HelpHazeHorizon");
- initHelpBtn("WLBlueDensityHelp", "HelpBlueDensity");
- initHelpBtn("WLHazeDensityHelp", "HelpHazeDensity");
-
- initHelpBtn("WLDensityMultHelp", "HelpDensityMult");
- initHelpBtn("WLDistanceMultHelp", "HelpDistanceMult");
- initHelpBtn("WLMaxAltitudeHelp", "HelpMaxAltitude");
-
- initHelpBtn("WLSunlightColorHelp", "HelpSunlightColor");
- initHelpBtn("WLAmbientHelp", "HelpSunAmbient");
- initHelpBtn("WLSunGlowHelp", "HelpSunGlow");
- initHelpBtn("WLTimeOfDayHelp", "HelpTimeOfDay");
- initHelpBtn("WLEastAngleHelp", "HelpEastAngle");
-
- initHelpBtn("WLSceneGammaHelp", "HelpSceneGamma");
- initHelpBtn("WLStarBrightnessHelp", "HelpStarBrightness");
-
- initHelpBtn("WLCloudColorHelp", "HelpCloudColor");
- initHelpBtn("WLCloudDetailHelp", "HelpCloudDetail");
- initHelpBtn("WLCloudDensityHelp", "HelpCloudDensity");
- initHelpBtn("WLCloudCoverageHelp", "HelpCloudCoverage");
-
- initHelpBtn("WLCloudScaleHelp", "HelpCloudScale");
- initHelpBtn("WLCloudScrollXHelp", "HelpCloudScrollX");
- initHelpBtn("WLCloudScrollYHelp", "HelpCloudScrollY");
-
- initHelpBtn("WLClassicCloudsHelp", "HelpClassicClouds");
-
LLWLParamManager * param_mgr = LLWLParamManager::instance();
// blue horizon
@@ -237,16 +207,6 @@ void LLFloaterWindLight::initCallbacks(void) {
getChild<LLUICtrl>("WLStarAlpha")->setCommitCallback(boost::bind(&LLFloaterWindLight::onStarAlphaMoved, this, _1));
}
-void LLFloaterWindLight::onClickHelp(std::string xml_alert)
-{
- LLNotifications::instance().add(contextualNotification(xml_alert));
-}
-
-void LLFloaterWindLight::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
- getChild<LLButton>(name)->setClickedCallback(boost::bind(&LLFloaterWindLight::onClickHelp, this, xml_alert));
-}
-
bool LLFloaterWindLight::newPromptCallback(const LLSD& notification, const LLSD& response)
{
std::string text = response["message"].asString();
diff --git a/indra/newview/llfloaterwindlight.h b/indra/newview/llfloaterwindlight.h
index 56c2c6623b1e0d197416496b31c23cb28d196781..ed9322c4509eab5028b1d2c99de5937ecb3a919d 100644
--- a/indra/newview/llfloaterwindlight.h
+++ b/indra/newview/llfloaterwindlight.h
@@ -57,10 +57,6 @@ class LLFloaterWindLight : public LLFloater
/// initialize all
void initCallbacks(void);
- // help button stuff
- void onClickHelp(std::string alert);
- void initHelpBtn(const std::string& name, const std::string& xml_alert);
-
bool newPromptCallback(const LLSD& notification, const LLSD& response);
/// general purpose callbacks for dealing with color controllers
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 8b625e7fa62099b09e5c14477e7fda7025388fba..04707d8d48a3d3a26540867e48fa424903cba98e 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -77,7 +77,6 @@ class LLNavigationBar
void onBackOrForwardButtonHeldDown(const LLSD& param);
void onForwardButtonClicked();
void onHomeButtonClicked();
- void onHelpButtonClicked();
void onLocationSelection();
void onLocationPrearrange(const LLSD& data);
void onSearchCommit();
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 4708d7ba364622b4a2f8b7e5961087526156ccce..10f015774afdc471db00d00662292435020cb608 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -86,23 +86,6 @@ BOOL LLPanelGroupTab::postBuild()
return TRUE;
}
-
-
-void LLPanelGroupTab::handleClickHelp()
-{
- // Display the help text.
- std::string help_text( getHelpText() );
- if ( !help_text.empty() )
- {
- LLSD args;
- args["MESSAGE"] = help_text;
- LLFloater* parent_floater = gFloaterView->getParentFloater(this);
- LLNotification::Params params(parent_floater->contextualNotification("GenericAlert"));
- params.substitutions(args);
- LLNotifications::instance().add(params);
- }
-}
-
LLPanelGroup::LLPanelGroup()
: LLPanel(),
LLGroupMgrObserver( LLUUID() ),
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index 5c7b0ddd0603bdb162925b0c5b9a13e5df1de386..306e6575fc7122a3ecfec663f8c35b6bbe873d45 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -148,12 +148,6 @@ class LLPanelGroupTab : public LLPanel
// Triggered when group information changes in the group manager.
virtual void update(LLGroupChange gc) { }
- // This is the text to be displayed when a help button is pressed.
- virtual std::string getHelpText() const { return mHelpText; }
-
- // Display anything returned by getHelpText
- void handleClickHelp();
-
// This just connects the help button callback.
virtual BOOL postBuild();
@@ -171,11 +165,8 @@ class LLPanelGroupTab : public LLPanel
protected:
LLUUID mGroupID;
- std::string mHelpText;
-
BOOL mAllowEdit;
BOOL mHasModal;
-
};
#endif // LL_LLPANELGROUP_H
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 71486c908cc1b82ea66e5befca367e1b6c9e8341..88aad4923d67bced285108a9020c3b15cde5aab8 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -361,20 +361,6 @@ void LLPanelGroupRoles::cancel()
panelp->cancel();
}
-// Pass all of these messages to the currently visible sub tab.
-std::string LLPanelGroupRoles::getHelpText() const
-{
- LLPanelGroupTab* panelp = (LLPanelGroupTab*) mSubTabContainer->getCurrentPanel();
- if (panelp)
- {
- return panelp->getHelpText();
- }
- else
- {
- return mHelpText;
- }
-}
-
void LLPanelGroupRoles::update(LLGroupChange gc)
{
if (mGroupID.isNull()) return;
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index bd5fc1d2350f77bd0f4ce7244754d15ccde5a134..b6e2245e70d0fcb9e6b58f2355cbf8b4e01ff635 100644
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -78,7 +78,6 @@ class LLPanelGroupRoles : public LLPanelGroupTab
bool onModalClose(const LLSD& notification, const LLSD& response);
// Most of these messages are just passed on to the current sub-tab.
- virtual std::string getHelpText() const;
virtual void activate();
virtual void deactivate();
virtual bool needsApply(std::string& mesg);
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index bce5525a4066618bedb854b092a5650e2515f5dc..417a8048347671d0e2884bfdd5b4bf9db621ec41 100644
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -70,7 +70,6 @@ BOOL LLPanelLandInfo::postBuild()
childSetAction("button subdivide land",onClickDivide,this);
childSetAction("button join land",onClickJoin,this);
childSetAction("button about land",onClickAbout,this);
- childSetAction("button show owners help", onShowOwnersHelp, this);
mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
childSetValue("checkbox show owners", gSavedSettings.getBOOL("ShowParcelOwners"));
@@ -265,8 +264,3 @@ void LLPanelLandInfo::onClickAbout(void*)
LLFloaterReg::showInstance("about_land");
}
-
-void LLPanelLandInfo::onShowOwnersHelp(void* user_data)
-{
- LLNotifications::instance().add("ShowOwnersHelp");
-}
diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h
index 92fe3134052984afeede523848294e571f5aae5b..02e7e7bf3856036c3578779a4429b76a851e27c4 100644
--- a/indra/newview/llpanelland.h
+++ b/indra/newview/llpanelland.h
@@ -60,7 +60,6 @@ class LLPanelLandInfo
static void onClickDivide(void*);
static void onClickJoin(void*);
static void onClickAbout(void*);
- static void onShowOwnersHelp(void*);
protected:
//LLTextBox* mTextPriceLabel;
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index e13aa610e535d118259e86ce2d530297267e765b..033e18a1395587b822517af3097ac67b70162c2d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1492,16 +1492,6 @@ Only large parcels can be listed in search.
name="item12"
value="other" />
</combo_box>
- <button
- follows="left|top"
- height="18"
- label="?"
- label_selected="?"
- layout="topleft"
- left_pad="15"
- name="?"
- top_delta="0"
- width="18" />
<check_box
height="16"
label="Mature Content"
@@ -1916,16 +1906,6 @@ Only large parcels can be listed in search.
name="check sound local"
top_delta="0"
width="292" />
- <button
- follows="left|top"
- height="18"
- label="?"
- label_selected="?"
- layout="topleft"
- left_delta="292"
- name="?"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index b8fa104352a362b0b196bd12a1f88c003fb80ee9..b0d636445d5bd40245a94895bf74d6f3f998eb21 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -28,16 +28,6 @@
name="Day Cycle"
top="0"
width="642">
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="15"
- label="?"
- layout="topleft"
- left="612"
- name="WLDayCycleHelp"
- top="3"
- width="18" />
<multi_slider
can_edit_text="true"
control_name="WLTimeSlider"
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index d98fdc5118be58d3176bcdc6a2c0c3397a5ffb4a..309475098f31f03a42599edceeeab94fb5d96977 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -323,15 +323,6 @@
left="40"
name="server_lag_cause"
right="-32" />
- <!--button
- bottom="145"
- follows="left|top"
- height="18"
- label="?"
- layout="topleft"
- name="server_help"
- right="-10"
- width="18" /-->
<button
follows="left|top"
height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index eb0c22b9c493e92725cfdace4751950093a7abb4..0967706cc29c4014d6b2fb32582c01ccfb72ea26 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -17,20 +17,6 @@
name="permissions"
top="20"
width="315">
- <button
- follows="left"
- height="18"
- label="?"
- label_selected="?"
- layout="topleft"
- left="260"
- name="help"
- top="7"
- width="22">
- <button.commit_callback
- function="Notification.Show"
- parameter="ClickUploadHelpPermissions" />
- </button>
<check_box
control_name="ShareWithGroup"
height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ca125383023c306d1f6d3ce9c53944cda97aa6dd..f566dbdb75f41e2b74a3497fe882613845ba4c81 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2868,15 +2868,6 @@
tool_tip="Colorize the parcels according to the type of owner: Green = Your land Aqua = Your group's land Red = Owned by others Yellow = For sale Purple = For auction Grey = Public"
top_pad="8"
width="205" />
- <!--TODO: HOOK UP TO HELP VIEWER-->
- <!-- <button
- image_overlay="Arrow_Right_Off"
- picture_style="true"
- left_pad="5"
- name="button show owners help"
- tool_tip="See an explanation of colors"
- width="26"
- height="22" />-->
<text
type="string"
length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
index af3606fd1c01819976d494f86ce6561ca5a94e9e..012b69c3e3f187bbc133af8ad2b227e98f2d08bc 100644
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -95,16 +95,6 @@
width="355">
Water Fog Color
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterFogColorHelp"
- top_delta="-2"
- width="18" />
<color_swatch
border_color="0.45098 0.517647 0.607843 1"
can_apply_immediately="true"
@@ -130,16 +120,6 @@
width="355">
Fog Density Exponent
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterFogDensityHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WaterFogDensity"
decimal_digits="1"
@@ -165,16 +145,6 @@
width="355">
Underwater Fog Modifier
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterUnderWaterFogModHelp"
- top_delta="-2"
- width="18" />
<slider
decimal_digits="2"
follows="left"
@@ -200,16 +170,6 @@
width="355">
Reflection Wavelet Scale
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterNormalScaleHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -298,16 +258,6 @@
width="355">
Fresnel Scale
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterFresnelScaleHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WaterFresnelScale"
decimal_digits="2"
@@ -333,16 +283,6 @@
width="355">
Fresnel Offset
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterFresnelOffsetHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WaterFresnelOffset"
decimal_digits="2"
@@ -368,16 +308,6 @@
width="355">
Refract Scale Above
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterScaleAboveHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WaterScaleAbove"
decimal_digits="2"
@@ -403,16 +333,6 @@
width="355">
Refract Scale Below
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterScaleBelowHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WaterScaleBelow"
decimal_digits="2"
@@ -438,16 +358,6 @@
width="355">
Blur Multiplier
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WaterBlurMultiplierHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WaterBlurMult"
follows="left"
@@ -486,16 +396,6 @@
width="355">
Big Wave Direction
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="145"
- name="WaterWave1Help"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -563,16 +463,6 @@
width="355">
Little Wave Direction
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="145"
- name="WaterWave2Help"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -640,16 +530,6 @@
width="355">
Normal Map
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="125"
- name="WaterNormalMapHelp"
- top_delta="-2"
- width="18" />
<texture_picker
height="143"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 2c09e82f087577e85ef18dfd8ee6574376fc90d0..fd905d7a14ef8324557b54646fc83be0922eb30c 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -104,16 +104,6 @@
width="355">
Blue Horizon
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLBlueHorizonHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -227,16 +217,6 @@
width="355">
Haze Horizon
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLHazeHorizonHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLHazeHorizon"
decimal_digits="2"
@@ -262,16 +242,6 @@
width="355">
Blue Density
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLBlueDensityHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -385,16 +355,6 @@
width="355">
Haze Density
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLHazeDensityHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLHazeDensity"
decimal_digits="2"
@@ -421,16 +381,6 @@
width="355">
Density Multiplier
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLDensityMultHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLDensityMult"
decimal_digits="2"
@@ -457,16 +407,6 @@
width="355">
Distance Multiplier
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLDistanceMultHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLDistancMult"
decimal_digits="1"
@@ -492,16 +432,6 @@
width="355">
Max Altitude
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLMaxAltitudeHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLMaxAltitude"
decimal_digits="0"
@@ -540,16 +470,6 @@
width="355">
Sun/Moon Color
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLSunlightColorHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -663,16 +583,6 @@
width="355">
Sun/Moon Position
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLTimeOfDayHelp"
- top_delta="-2"
- width="18" />
<icon
height="20"
image_name="icon_diurnal.tga"
@@ -705,16 +615,6 @@
width="355">
Ambient
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLAmbientHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -828,16 +728,6 @@
width="355">
East Angle
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLEastAngleHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLEastAngle"
decimal_digits="2"
@@ -863,16 +753,6 @@
width="355">
Sun Glow
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLSunGlowHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLGlowB"
decimal_digits="2"
@@ -915,16 +795,6 @@
width="200">
Scene Gamma
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLSceneGammaHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLGamma"
decimal_digits="2"
@@ -951,16 +821,6 @@
width="355">
Star Brightness
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLStarBrightnessHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLStarAlpha"
decimal_digits="2"
@@ -1000,16 +860,6 @@
width="355">
Cloud Color
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLCloudColorHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -1123,16 +973,6 @@
width="355">
Cloud XY/Density
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLCloudDensityHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -1221,16 +1061,6 @@
width="355">
Cloud Coverage
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLCloudCoverageHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLCloudCoverage"
decimal_digits="2"
@@ -1256,16 +1086,6 @@
width="355">
Cloud Scale
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLCloudScaleHelp"
- top_delta="-2"
- width="18" />
<slider
control_name="WLCloudScale"
decimal_digits="2"
@@ -1292,16 +1112,6 @@
width="355">
Cloud Detail (XY/Density)
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="150"
- name="WLCloudDetailHelp"
- top_delta="-2"
- width="18" />
<text
type="string"
length="1"
@@ -1390,16 +1200,6 @@
width="355">
Cloud Scroll X
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="125"
- name="WLCloudScrollXHelp"
- top_delta="-2"
- width="18" />
<check_box
control_name="WLCloudLockX"
follows="left"
@@ -1436,16 +1236,6 @@
width="355">
Cloud Scroll Y
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="125"
- name="WLCloudScrollYHelp"
- top_delta="-2"
- width="18" />
<check_box
control_name="WLCloudLockY"
follows="left"
@@ -1479,16 +1269,6 @@
name="DrawClassicClouds"
top="104"
width="200" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left="608"
- name="WLClassicCloudsHelp"
- top="84"
- width="18" />
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d51cb1309310ec5587154537cd27d0f5f8799744..babed28f10eaac707b0fd7d5286631dd2f3b9dbe 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -370,99 +370,12 @@ Add this Ability to '[ROLE_NAME]'?
</notification>
<notification
- icon="alertmodal.tga"
- name="ClickPublishHelpLand"
- type="alertmodal">
-Selecting the "Publish in Search"
-Checking this box will show:
-- this parcel in search results
-- this parcel's public objects
-- this parcel in web search
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickSoundHelpLand"
- type="alertmodal">Media and Music can only be experienced within the parcel. Sound and Voice options can be restricted to the parcel or will be heard by residents outside the parcel depending on their maturity Rating. Go to Knowledge Base to learn more about how to set these options?
- <url option="0" name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=5046
- </url>
- <usetemplate
- name="okcancelbuttons"
- yestext="Go to Knowledge Base"
- notext="Close" />
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickSearchHelpAll"
- type="alertmodal">
-Search results are organized based on the tab you are in, your maturity Rating, the category chosen, and other factors. For more details, please see the Knowledge Base.
- <url option="0" name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4722
- </url>
- <usetemplate
- name="okcancelbuttons"
- yestext="Go to Knowledge Base"
- notext="Close" />
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickPublishHelpLandDisabled"
- type="alertmodal">
-You can't make this parcel show in search because it is located in a region that forbids this.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickPublishHelpAvatar"
- type="alertmodal">
-Selecting "Show in Search" will show:
-- my profile in search results
-- a link to my profile in public group pages
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickPartnerHelpAvatar"
- type="alertmodal">
-You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
-
-Go to the [SECOND_LIFE] web site for more information on partnering?
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="Go to Page"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickUploadHelpPermissions"
- type="alertmodal">
-Your default permissions may not work in older regions.
- </notification>
-
-<notification
icon="alertmodal.tga"
name="ClickUnimplemented"
type="alertmodal">
Sorry, not implemented yet.
</notification>
- <notification
- icon="alertmodal.tga"
- name="ClickWebProfileHelpAvatar"
- type="alertmodal">
-If this Resident has set a web profile URL then you can:
- * Click 'Load' to see the page in this Web tab.
- * Click Load > 'In external browser' to view the page in your default web browser.
- * Click Load > 'Home URL' to return to this Resident's web profile if you've navigated away.
-
-When viewing your own profile, you can enter any URL as your web profile and click OK to set it.
-Other residents can visit the URL you set when they look at your profile.
- </notification>
-
<notification
icon="alertmodal.tga"
name="JoinGroupCanAfford"
@@ -1957,21 +1870,6 @@ Join land?
yestext="OK"/>
</notification>
- <notification
- icon="alertmodal.tga"
- name="ShowOwnersHelp"
- type="alertmodal">
-Show owners:
-Color parcels to show the owner type.
-
-Green = Your land
-Aqua = Your Group's land
-Red = Owned by others
-Yellow = For sale
-Purple = For auction
-Grey = Public
- </notification>
-
<notification
icon="alertmodal.tga"
name="ConfirmNotecardSave"
@@ -2845,18 +2743,6 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe
yestext="Go to page"/>
</notification>
- <notification
- icon="alertmodal.tga"
- name="WebLaunchPublicIssueHelp"
- type="alertmodal">
-Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
- <usetemplate
- ignoretext="Launch my browser to view instructions for the Public Issue Tracker"
- name="okcancelignore"
- notext="Cancel"
- yestext="Go to page"/>
- </notification>
-
<notification
icon="alertmodal.tga"
name="WebLaunchSupportWiki"
@@ -3634,669 +3520,272 @@ Type a short announcement which will be sent to everyone in this region.
<notification
icon="alertmodal.tga"
- label="Block Terraform"
- name="HelpRegionBlockTerraform"
+ label="Changed Region Maturity"
+ name="RegionMaturityChange"
type="alertmodal">
-If this box is checked, land owners will not be able to terraform their land regardless of the per-parcel 'Edit Terrain' setting.
-
-Default: off
+The maturity rating for this region has been updated.
+It may take some time for the change to be reflected on the map.
</notification>
<notification
icon="alertmodal.tga"
- label="Block Fly"
- name="HelpRegionBlockFly"
+ label="Voice Version Mismatch"
+ name="VoiceVersionMismatch"
type="alertmodal">
-If this box is checked, people will not be able to fly in this region regardless of the per-parcel 'Fly' setting.
-
-Default: off
+This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
</notification>
<notification
icon="alertmodal.tga"
- label="Bulk Change Content Permissions"
- name="HelpBulkPermission"
+ label="Can't Buy Objects"
+ name="BuyObjectOneOwner"
type="alertmodal">
-The Bulk Permissions tool helps you to quickly change the permissions on multiple items in the contents of the selected object(s). However, please note that you are only setting permissions on the items in the Contents of the selected objects -- not permissions on the container object(s) themselves.
-
-Also note, the permissions are not applied to the nested contents of any of the contained items. Your request only operates on items exactly one level deep.
-
-You can selectively choose which types of items to modify by using the checklist under 'Content Types' here. Snapshots are included when you select Textures.
-
-* This tool will only succeed at changing permissions on items you are allowed to change.
-* You cannot grant any Next owner permissions which you do not already have.
-* The Next owner permissions are merely requests. If any item cannot take all of the new permissions, none of its permissions will change.
-
-When you are ready to change the permissions in bulk, click 'Apply' and wait for the results to display.
-
-If you close the Bulk Permissions window while permissions are being changed, it will halt the operation.
+Cannot buy objects from different owners at the same time.
+Please select only one object and try again.
</notification>
<notification
icon="alertmodal.tga"
- label="Allow Damage"
- name="HelpRegionAllowDamage"
+ label="Can't Buy Contents"
+ name="BuyContentsOneOnly"
type="alertmodal">
-If this box is checked, the health system across all parcels regardless of individual parcel settings. If this box is left unchecked, individual parcel owners will still be able to activate the health system on their parcels.
-
-Default: off
+Unable to buy the contents of more than one object at a time.
+Please select only one object and try again.
</notification>
<notification
icon="alertmodal.tga"
- label="Agent Limit"
- name="HelpRegionAgentLimit"
+ label="Can't Buy Contents"
+ name="BuyContentsOneOwner"
type="alertmodal">
-Sets the maximum number of avatars allowed in this region.
-Performance may vary depending on the number avatars present.
-
-Default: 40
+Cannot buy objects from different owners at the same time.
+Please select only one object and try again.
</notification>
<notification
icon="alertmodal.tga"
- label="Object Bonus"
- name="HelpRegionObjectBonus"
+ name="BuyOriginal"
type="alertmodal">
-The Object Bonus is a multiplier for primitives allowed on any given parcel. The range allowed is 1 to 10. Set at '1', each 512m² parcel is allowed 117 objects. Set at '2', each 512m² parcel is allowed 234, or twice as many, and so on. The max number of objects allowed per region remains 15,000 no matter what the Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted.
-
-Default: 1.0
+Buy original object from [OWNER] for L$[PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Maturity"
- name="HelpRegionMaturity"
+ name="BuyOriginalNoOwner"
type="alertmodal">
-Sets the maturity Rating of the Region, as shown in the menu bar at the top of any Resident's viewer, and in tooltips on the World Map when the cursor hovers over this Region. This setting also affects access to this Region and search results. Other Residents may only enter Regions or view search results with the same maturity Ratings they have chosen in their preferences.
-
-It may take some time for this change to be reflected on the map.
+Buy original object for L$[PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Restrict Pushing"
- name="HelpRegionRestrictPushObject"
+ name="BuyCopy"
type="alertmodal">
-This checkbox sets the full region to restricted push permissions.
-When enabled, Residents may only be pushed by themselves or by the parcel's owner.
-(Push refers to the llPushObject() LSL function.)
-
-Default: Off
+Buy a copy from [OWNER] for L$[PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Parcel Join/Subdivide"
- name="HelpParcelChanges"
+ name="BuyCopyNoOwner"
type="alertmodal">
-This checkbox sets whether or not parcels not owned by the estate owner can be joined or subdivided.
-If this option is unchecked:
- * Only estate owners or managers can join or subdivide parcels.
- * They may only join or subdivide parcels belonging to the owner, or to a group where they have the appropriate group powers.
-If this option is checked:
- * All parcel owners can join or subdivide the parcels they own.
- * For group owned parcels, those with appropriate group powers may join or subdivide parcels.
-
-Default: Checked
+Buy a copy for L$[PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Do Not Show In Search"
- name="HelpRegionSearch"
+ name="BuyContents"
type="alertmodal">
-Checking this box will block parcel owners from listing their parcels in search.
-
-Default: Off
+Buy contents from [OWNER] for L$[PRICE]?
+They will be copied to your inventory.
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Changed Region Maturity"
- name="RegionMaturityChange"
+ name="BuyContentsNoOwner"
type="alertmodal">
-The maturity rating for this region has been updated.
-It may take some time for the change to be reflected on the map.
+Buy contents for L$[PRICE]?
+They will be copied to your inventory.
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Land Resale"
- name="HelpRegionLandResell"
+ name="ConfirmPurchase"
type="alertmodal">
-Estate owners and managers can sell any land owned by the estate owner.
-If this option is left unchecked, buyers cannot resell their land in this region.
-If this option is checked, buyers can resell their land in this region.
+This transaction will:
+[ACTION]
-Default: Disallow
+Are you sure you want to proceed with this purchase?
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Disable Scripts"
- name="HelpRegionDisableScripts"
- type="alertmodal">
-When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl+Shift+1). Look at the Simulator Physics FPS.
-If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Script Time reads 25 ms or higher, click the Get Top Scripts button. You will be given the name and location of scripts that may be causing poor performance.
+ name="ConfirmPurchasePassword"
+ type="password">
+This transaction will:
+[ACTION]
-Checking the Disable Scripts box and then pressing the Apply button will temporarily disable all scripts in this region. You may need to do this in order to travel to the location of a noted 'top script'. Once you have arrived at the location, investigate the script to determine if it is causing the problem. You may want to contact the owner of the script or delete or return the object.
-Uncheck the Disable Script box and then Apply to reactivate the scripts in the region.
+Are you sure you want to proceed with this purchase?
+Please re-enter your password and click OK.
+ <form name="form">
+ <input
+ name="message"
+ type="password"/>
+ <button
+ default="true"
+ index="0"
+ name="ConfirmPurchase"
+ text="OK"/>
+ <button
+ index="1"
+ name="Cancel"
+ text="Cancel"/>
+ </form>
+ </notification>
-Default: off
+ <notification
+ icon="alert.tga"
+ name="SetPickLocation"
+ type="alert">
+Note:
+You have updated the location of this pick but the other details will retain their original values.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Disable Collisions"
- name="HelpRegionDisableCollisions"
+ name="MoveInventoryFromObject"
type="alertmodal">
-When sim performance is poor, physical objects may be to blame.
-Open the Statistics Bar (Ctrl+Shift+1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button.
-You will be given the name and location of physical objects that may be causing poor performance.
-
-Checking the Disable Collisions box and then pressing the Apply button will temporarily disable object-object collisions. You may need to do this in order to travel to the location of a noted 'top collider'. Once you have arrived at the location, investigate the object - is it constantly colliding with other objects? You may want to contact the owner of the object or delete or return the object.
-Uncheck the Disable Collisions box and then Apply to reactivate collisions in the region.
+You have selected 'no copy' inventory items.
+These items will be moved to your inventory, not copied.
-Default: off
+Move the inventory item(s)?
+ <usetemplate
+ ignoretext="Warn me before I move 'no-copy' items from an object"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Disable Physics"
- name="HelpRegionDisablePhysics"
+ name="MoveInventoryFromScriptedObject"
type="alertmodal">
-Disable Physics is similar to Disable Collisions, except all physics simulation is disabled. This means that not only will objects stop colliding, but avatars will be unable to move.
-
-This should only be used when Disable Collisions does not give back enough performance to the region to investigate a physics problem or Top Collider.
+You have selected 'no copy' inventory items. These items will be moved to your inventory, not copied.
+Because this object is scripted, moving these items to your inventory may cause the script to malfunction.
-Be sure to re-enable physics when you are done, or avatars will continue to be unable to move.
+Move the inventory item(s)?
+ <usetemplate
+ ignoretext="Warn me before I move 'no-copy' items which might break a scripted object"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
-Default: off
+ <notification
+ icon="alert.tga"
+ name="ClickActionNotPayable"
+ type="alert">
+Warning: The 'Pay object' click action has been set, but it will only work if a script is added with a money() event.
+ <form name="form">
+ <ignore name="ignore"
+ text="I set the action 'Pay object' when building an object without a money() script"/>
+ </form>
</notification>
<notification
icon="alertmodal.tga"
- label="Top Colliders"
- name="HelpRegionTopColliders"
+ name="OpenObjectCannotCopy"
type="alertmodal">
-Show a list of objects experiencing the greatest number of potential object-object collisions. These objects can slow performance. Select Advanced > Performance Tools > Statistics Bar and look under Simulator > Time > Physics Time to see if more than 20 ms is being spent in physics.
+There are no items in this object that you are allowed to copy.
</notification>
<notification
icon="alertmodal.tga"
- label="Top Scripts"
- name="HelpRegionTopScripts"
+ name="WebLaunchAccountHistory"
type="alertmodal">
-Show a list of objects spending the most time running LSL scripts. These objects can slow performance.
-Select Advanced > Performance Tools > Statistics Bar and look under Simulator > Time > Script Time to see if more than 25 ms is being spent in scripts.
+Go to your [http://secondlife.com/account/ Dashboard] to see your account history?
+ <usetemplate
+ ignoretext="Launch my browser to see my account history"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="Go to page"/>
</notification>
<notification
icon="alertmodal.tga"
- label="Restart Region"
- name="HelpRegionRestart"
+ name="ConfirmQuit"
type="alertmodal">
-Restart the server process running this region after a two minute warning. All Residents in the region will be disconnected. The region will save its data, and should come back up within 90 seconds.
-
-Restarting the region will not fix most performance problems, and should usually be used only when directed.
+Are you sure you want to quit?
+ <usetemplate
+ ignoretext="Confirm before I quit"
+ name="okcancelignore"
+ notext="Don't Quit"
+ yestext="Quit"/>
+ <unique/>
</notification>
<notification
icon="alertmodal.tga"
- label="Water Height"
- name="HelpRegionWaterHeight"
+ name="HelpReportAbuseEmailLL"
type="alertmodal">
-This is the height in meters where water appears. If this setting is anything other than 20 and you have water that is adjacent to the edge of world or 'void' water, there will be a visible gap.
+Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
-Default: 20
+All reported abuses are investigated and resolved. You can view the resolution by reading the [http://secondlife.com/support/incidentreport.php Incident Report].
+ <unique/>
</notification>
<notification
icon="alertmodal.tga"
- label="Terrain Raise"
- name="HelpRegionTerrainRaise"
- type="alertmodal">
-This is the distance in meters that parcel owners can raise their terrain above the 'baked' terrain default height.
-
-Default: 4
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Terrain Lower"
- name="HelpRegionTerrainLower"
- type="alertmodal">
-This is the distance in meters that parcel owners can lower their terrain below the 'baked' terrain default height.
-
-Default: -4
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Upload RAW Terrain"
- name="HelpRegionUploadRaw"
- type="alertmodal">
-This button uploads a .RAW file to the region you are in.
-The file must have the correct dimensions (RGB, 256x256) and 13 channels. The best way to create a terrain file is to download the existing RAW file. A good first step is to modify the red channel (land height), and upload it.
-
-The upload can take up to 45 seconds. Note that uploading a terrain file *will not* move the objects that are on the land, only the terrain itself and the permissions associated with the parcels. This can result in objects going underground.
-
-For more information on editing region height fields, consult F1 Help.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Download RAW Terrain"
- name="HelpRegionDownloadRaw"
- type="alertmodal">
-This button downloads a file containing the height field data, parcel dimensions, parcel for sale status and some parcel permissions for this region. When opening the file in a program such as Photoshop you must specify the document's dimensions which are: RGB, 256x256 with 13 channels. This terrain file cannot be opened in any other way.
-
-For more information on editing region height fields, consult F1 help.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Use Estate Sun"
- name="HelpRegionUseEstateSun"
- type="alertmodal">
-This checkbox makes the sun position in this region the same as the sun position in the rest of the estate.
-
-Default: on
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Fixed Sun"
- name="HelpRegionFixedSun"
- type="alertmodal">
-This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving.
-
-Default: off
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Bake Terrain"
- name="HelpRegionBakeTerrain"
- type="alertmodal">
-This button saves the current shape of the terrain as the new default for the region. Once baked, the land can revert to the saved shape whenever you or others use the Edit Terrain 'Revert' option. The baked terrain is also the middle point for the terrain raise and lower limits.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Estate Managers"
- name="HelpEstateEstateManager"
- type="alertmodal">
-An estate manager is a Resident to whom you have delegated control of region and estate settings. An estate manager can change any setting in these panels, except for uploading, downloading, and baking terrain. In particular, they can allow or ban Residents from your estate.
-
-Estate managers can only be added or removed by the owner of the estate, not by each other. Please only choose Residents you trust as estate managers, as you will be ultimately responsible for their actions.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Use Global Time"
- name="HelpEstateUseGlobalTime"
- type="alertmodal">
-This checkbox makes the sun in your estate follow the same position as on the Linden-owned 'mainland' estates.
-
-Default: on
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Fixed Sun"
- name="HelpEstateFixedSun"
- type="alertmodal">
-This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Public Access"
- name="HelpEstateExternallyVisible"
- type="alertmodal">
-This checkbox sets whether Residents who are on other estates can enter this estate without being on an access list.
-
-Default: on
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Allow Direct Teleport"
- name="HelpEstateAllowDirectTeleport"
- type="alertmodal">
-When checked, allows Residents to directly teleport to any point in your estate. When unchecked, Residents teleport to the nearest telehub.
-
-Default: off
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Allow Access"
- name="HelpEstateAllowResident"
- type="alertmodal">
-Access to this estate will be limited to Residents listed here and any groups below. This setting is only available when Public Access is unchecked.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Allow Group Access"
- name="HelpEstateAllowGroup"
- type="alertmodal">
-Access to this estate will be limited to groups listed here and any Residents above. This setting is only available when Public Access is unchecked.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Abuse Email Address"
- name="HelpEstateAbuseEmailAddress"
- type="alertmodal">
-Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
-Setting it blank will cause abuse reports to be sent only to Linden Lab.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Deny Access"
- name="HelpEstateBanResident"
- type="alertmodal">
-Residents on this list are denied access to your estate, regardless of any other settings.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Allow Voice Chat"
- name="HelpEstateVoiceChat"
- type="alertmodal">
-Parcels in this estate are allowed to have their own voice channels in which residents may hear and talk with others nearby.
-
-Default: off
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Voice Version Mismatch"
- name="VoiceVersionMismatch"
- type="alertmodal">
-This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Estate Covenant"
- name="HelpEstateCovenant"
- type="alertmodal">
-Setting an estate covenant enables you to sell parcels within that estate. If a covenant is not set, you cannot sell the land. The notecard for your covenant can be empty if you do not wish to apply any rules or advise buyers of anything in relation to the land before they buy it.
-
-A covenant can be used to communicate rules, guidelines, cultural information or simply your own expectations to the prospective buyer. This can include zoning, building regulations, payment options or any other information you feel it is important for the new owner to have seen and to have agreed to before they purchase.
-
-The buyer must agree to the covenant by ticking the check box before they will be able to finish the purchase. Estate covenants are always visible in the About Land dialog for any parcels that have one set.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Can't Buy Objects"
- name="BuyObjectOneOwner"
- type="alertmodal">
-Cannot buy objects from different owners at the same time.
-Please select only one object and try again.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Can't Buy Contents"
- name="BuyContentsOneOnly"
- type="alertmodal">
-Unable to buy the contents of more than one object at a time.
-Please select only one object and try again.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- label="Can't Buy Contents"
- name="BuyContentsOneOwner"
- type="alertmodal">
-Cannot buy objects from different owners at the same time.
-Please select only one object and try again.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="BuyOriginal"
- type="alertmodal">
-Buy original object from [OWNER] for L$[PRICE]?
-You will become the owner of this object.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="BuyOriginalNoOwner"
- type="alertmodal">
-Buy original object for L$[PRICE]?
-You will become the owner of this object.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="BuyCopy"
- type="alertmodal">
-Buy a copy from [OWNER] for L$[PRICE]?
-The object will be copied to your inventory.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="BuyCopyNoOwner"
- type="alertmodal">
-Buy a copy for L$[PRICE]?
-The object will be copied to your inventory.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="BuyContents"
- type="alertmodal">
-Buy contents from [OWNER] for L$[PRICE]?
-They will be copied to your inventory.
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="BuyContentsNoOwner"
- type="alertmodal">
-Buy contents for L$[PRICE]?
-They will be copied to your inventory.
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ConfirmPurchase"
- type="alertmodal">
-This transaction will:
-[ACTION]
-
-Are you sure you want to proceed with this purchase?
- <usetemplate
- name="okcancelbuttons"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ConfirmPurchasePassword"
- type="password">
-This transaction will:
-[ACTION]
-
-Are you sure you want to proceed with this purchase?
-Please re-enter your password and click OK.
- <form name="form">
- <input
- name="message"
- type="password"/>
- <button
- default="true"
- index="0"
- name="ConfirmPurchase"
- text="OK"/>
- <button
- index="1"
- name="Cancel"
- text="Cancel"/>
- </form>
- </notification>
-
- <notification
- icon="alert.tga"
- name="SetPickLocation"
- type="alert">
-Note:
-You have updated the location of this pick but the other details will retain their original values.
- <usetemplate
- name="okbutton"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="MoveInventoryFromObject"
- type="alertmodal">
-You have selected 'no copy' inventory items.
-These items will be moved to your inventory, not copied.
-
-Move the inventory item(s)?
- <usetemplate
- ignoretext="Warn me before I move 'no-copy' items from an object"
- name="okcancelignore"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="MoveInventoryFromScriptedObject"
- type="alertmodal">
-You have selected 'no copy' inventory items. These items will be moved to your inventory, not copied.
-Because this object is scripted, moving these items to your inventory may cause the script to malfunction.
-
-Move the inventory item(s)?
- <usetemplate
- ignoretext="Warn me before I move 'no-copy' items which might break a scripted object"
- name="okcancelignore"
- notext="Cancel"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alert.tga"
- name="ClickActionNotPayable"
- type="alert">
-Warning: The 'Pay object' click action has been set, but it will only work if a script is added with a money() event.
- <form name="form">
- <ignore name="ignore"
- text="I set the action 'Pay object' when building an object without a money() script"/>
- </form>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="OpenObjectCannotCopy"
- type="alertmodal">
-There are no items in this object that you are allowed to copy.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="WebLaunchAccountHistory"
- type="alertmodal">
-Go to your [http://secondlife.com/account/ Dashboard] to see your account history?
- <usetemplate
- ignoretext="Launch my browser to see my account history"
- name="okcancelignore"
- notext="Cancel"
- yestext="Go to page"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ClickOpenF1Help"
- type="alertmodal">
-Do you want to visit [SECOND_LIFE] help?
- <usetemplate
- ignoretext="Launch my browser to view Help/Support"
- name="okcancelignore"
- notext="Cancel"
- yestext="Go"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="ConfirmQuit"
- type="alertmodal">
-Are you sure you want to quit?
- <usetemplate
- ignoretext="Confirm before I quit"
- name="okcancelignore"
- notext="Don't Quit"
- yestext="Quit"/>
- <unique/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpReportAbuseEmailLL"
- type="alertmodal">
-Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
-
-All reported abuses are investigated and resolved. You can view the resolution by reading the [http://secondlife.com/support/incidentreport.php Incident Report].
- <unique/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpReportAbuseEmailEO"
+ name="HelpReportAbuseEmailEO"
type="alertmodal">
IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab.
@@ -4499,31 +3988,6 @@ Link to this from a web page to give others easy access to this location, or try
</form>
</notification>
- <notification
- icon="alertmodal.tga"
- name="GraphicsPreferencesHelp"
- type="alertmodal">
-This panel controls window size and resolution and the quality of the client's graphics. The Preferences > Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by clicking the Advanced button and manipulating the following settings:
-
-Shaders: Enable or disable various types of pixel shaders.
-
-Reflection Detail: Sets the types of objects that water can reflect.
-
-Avatar Rendering: Sets options that affect how the client renders avatars.
-
-Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
-
-Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
-
-Post Process Quality: Sets the resolution with which Glow is rendered.
-
-Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.
-
-Lighting Detail: Selects what types of lights you would like to render.
-
-Terrain Detail: Sets the amount of detail you would like to see for the terrain texture.
- </notification>
-
<notification
icon="alertmodal.tga"
name="WLSavePresetAlert"
@@ -4571,306 +4035,6 @@ PostProcess Effect exists. Do you still wish overwrite it?
yestext="Yes"/>
</notification>
- <notification
- icon="alertmodal.tga"
- name="HelpEditSky"
- type="alertmodal">
-Edit the WindLight sliders to create and save a set of skies.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpEditDayCycle"
- type="alertmodal">
-Set which skies to turn to throughout the day.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="EnvSettingsHelpButton"
- type="alertmodal">
-These settings adjust the way the environment looks locally on your computer. Your graphics card needs to support atmospheric shaders in order to have access to all of the settings.
-
-Adjust the "Time of Day" slider to change the day's phase locally on the viewer.
-
-Adjust the "Cloud Cover" slider to control how much the clouds cover the sky.
-
-Pick a color in the "Water Color" color picker to change the color of the water.
-
-Adjust the "Water Fog" slider to control how dense the fog is underwater.
-
-Click "Use Estate Time" to reset the time of day to the region's current time of day and remain linked to it.
-
-Click "Advanced Sky" to bring up an editor with more advanced settings for the sky.
-
-Click "Advanced Water" to bring up an editor with more advanced settings for the water.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpDayCycle"
- type="alertmodal">
-The Day Cycle Editor gives you control over the sky during [SECOND_LIFE]'s day/night cycle. This is the cycle that is used by the Basic Environment Editor's Time of Day slider.
-
-The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky "animates" as it interpolates between these keyframes.
-
-The yellow arrow above the timeline represents your current view, based on Time of Day. Click and drag it to see how your day will animate. You may add or delete keyframes by pressing the Add Key and Delete Key buttons to the right of the timeline.
-
-You can set the time position of a keyframe by either dragging it along the timeline, or by setting its value manually in the Key Frame Settings frame. Within the Key Frame Settings frame, you'll be able to associate the keyframe with its respective WindLight preset.
-
-Length of Cycle dictates the overall duration of a "day". Setting this to a low value (for instance, 2 min.) will mean your entire 24-hour timeline will animate in only two real minutes! Once you are satisfied with your timeline and keyframe cycle, use the Play and Stop buttons to preview the results. Remember- you can also move the yellow time-indicator arrow above the timeline to see the cycle animate interactively. Using the Use Estate Time button will synchronize your day length and time of day with the Estate's day cycle.
-
-Once you are pleased with your Day Cycle, you can save and load it with the Save Test Day and Load Test Day buttons. Note that, for now, we only allow one Day Cycle.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpBlueHorizon"
- type="alertmodal">
-Use the Red/Green/Blue (RGB) sliders to adjust the color of the sky. You can use the Intensity (I) slider to move all three RGB sliders in unison.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpHazeHorizon"
- type="alertmodal">
-Haze Horizon is one of the most useful parameters for adjusting overall light exposure in the scene. It is effective for simulating many exposure settings, such as white-outs from the sun and darker, closed-iris settings.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpBlueDensity"
- type="alertmodal">
-Blue Density affects the overall color saturation of the sky and fog. If you move the Intensity (I) slider to the right, colors will become brighter and more vibrant. If you move it all the way to the left, the colors will become duller, eventually fading to black and white. If you want to fine-tune the sky's color balance, you can control individual elements of saturation by using the Red/Green/Blue (RGB) sliders.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpHazeDensity"
- type="alertmodal">
-Haze Density controls the level of dull, gray haze in the atmosphere. It is effective for simulating scenes with high levels of smoke and man-made pollutants. It is also effective for simulating fog and mist.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpDensityMult"
- type="alertmodal">
-The Density Multiplier can be used to affect the overall atmospheric density. At lower settings, it creates a feeling of "thin air", and at higher settings, it creates a very heavy, smoggy effect.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpDistanceMult"
- type="alertmodal">
-Adjusts WindLight's perceived distance. A value of zero effectively turns off WindLight's influence on terrain and objects. Values greater than 1 simulate greater distances for thicker atmospheric effects.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpMaxAltitude"
- type="alertmodal">
-Max Altitude adjusts the altitude calculations WindLight performs when computing its atmospheric lighting. At later times of day, it is useful for adjusting how "deep" the sunset appears.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpSunlightColor"
- type="alertmodal">
-Adjusts the color and intensity of the direct light in the scene.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpSunAmbient"
- type="alertmodal">
-Adjusts the color and intensity of ambient atmospheric light in the scene.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpSunGlow"
- type="alertmodal">
-The Size slider controls the size of the sun.
-The Focus slider controls how blurred the sun is over the sky.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpSceneGamma"
- type="alertmodal">
-Adjust the screen's distribution of light and dark.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpStarBrightness"
- type="alertmodal">
-Adjusts the brightness of the stars in the sky.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpTimeOfDay"
- type="alertmodal">
-Controls the location of the sun in the sky.
-Similar to elevation.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpEastAngle"
- type="alertmodal">
-Controls the location of the sun in the sky.
-Similar to azimuth.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudColor"
- type="alertmodal">
-Edits the color of the clouds. It is generally recommended to keep it whitish, but hey, have fun if you want.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudDetail"
- type="alertmodal">
-Controls the detail image layered on top of the main cloud image. X and Y control its position. D (Density) controls how puffy or fractured the clouds appear.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudDensity"
- type="alertmodal">
-Allows you to control the position of the clouds with the X and Y sliders and how dense they are with the the D slider.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudCoverage"
- type="alertmodal">
-Controls how much the clouds cover the sky.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudScale"
- type="alertmodal">
-Controls the scaling of the cloud image on the sky dome.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudScrollX"
- type="alertmodal">
-Controls the speed of the clouds as they move in the X direction.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpCloudScrollY"
- type="alertmodal">
-Controls the speed of the clouds as they move in the Y direction.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpClassicClouds"
- type="alertmodal">
-Check this box to enable rendering of [SECOND_LIFE]'s older classic clouds in addition to WindLight's clouds.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterFogColor"
- type="alertmodal">
-Chooses the color of the underwater fog.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterFogDensity"
- type="alertmodal">
-Controls how dense the water fog is and how far you can see underwater.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpUnderWaterFogMod"
- type="alertmodal">
-Modifies the effect of the Fog Density Exponent to control how far you can see when your avatar is underwater.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterGlow"
- type="alertmodal">
-Controls how much the surface of the water glows.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterNormalScale"
- type="alertmodal">
-Controls the scaling of the three wavelets that make up the water.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterFresnelScale"
- type="alertmodal">
-Controls how much light is reflected at different angles.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterFresnelOffset"
- type="alertmodal">
-Controls how much light intensity is reflected.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterScaleAbove"
- type="alertmodal">
-Controls how much light is refracted from looking above the surface of the water.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterScaleBelow"
- type="alertmodal">
-Controls how much light is refracted from looking from below the surface of the water.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterBlurMultiplier"
- type="alertmodal">
-Controls how waves and reflections are mixed.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterNormalMap"
- type="alertmodal">
-Controls what normal map is layered across the water to determine reflections/refractions.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterWave1"
- type="alertmodal">
-Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="HelpWaterWave2"
- type="alertmodal">
-Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.
- </notification>
-
<notification
icon="alert.tga"
name="NewSkyPreset"
@@ -5618,14 +4782,6 @@ You are banned from the region.
Your account cannot connect to this teen grid region.
</notification>
- <notification
- icon="notify.tga"
- name="NoHelpIslandTP"
- type="notify">
-You cannot teleport back to Help Island.
-Go to 'Help Island Public' to repeat the tutorial.
- </notification>
-
<notification
icon="notify.tga"
name="ImproperPaymentStatus"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 04e0ad3be8a3d3b94bfcaeb09b66d0974b45b32f..c81c7113ae22a4b241b47cb3137afb6a7808d259 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -29,17 +29,6 @@
name="land_contrib_error">
Unable to set your land contribution.
</panel.string>
- <!--
- <button
- follows="left|top"
- height="16"
- label="?"
- layout="topleft"
- left="250"
- name="help_button"
- top="8"
- width="20" />
- -->
<!-- <text
type="string"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index d9fb962998246cfac15a5d5cb18205a41e40cc0b..0e4d490369af3560b75c50b27565b7b937b4218c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -22,16 +22,6 @@ the General tab.
name="no_notices_text">
There are no past notices.
</panel.string>
- <!-- <button
- follows="left|top"
- height="16"
- label="?"
- label_selected="?"
- layout="topleft"
- left="250"
- name="help_button"
- top="8"
- width="20" /> -->
<!--<text
follows="left|top"
type="string"
@@ -383,4 +373,4 @@ the General tab.
top_pad="10"
width="135" />
</panel>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 909c3f457760fbfb8c6f5e71cee8fab6b9d989db..e87859f788af9d2a5c7149ef739e7ffa05fb728d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -18,17 +18,6 @@
</panel.string>
<panel.string
name="help_text" />
- <!--
- <button
- follows="left|top"
- height="16"
- label="?"
- layout="topleft"
- left="250"
- name="help_button"
- top="8"
- width="20" />
- -->
<!--<panel
follows="left|top"
height="80"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index b3147f5e6bafd51ace1c6e3841c467fd5bdaf2e6..49fc930cd8ae1ba18225cf3fbd683e082b45e174 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -103,17 +103,6 @@
width="308">
Last Modified Wed Dec 31 16:00:00 1969
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="5"
- name="covenant_help"
- top_delta="-2"
- width="18" />
-
<text_editor
enabled="false"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 25e1171688c7a89c7c35050bae7cdb2fad4a5686..a1bca4229dcfa2cf309ad46a369d0a254b0199ac 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -40,16 +40,6 @@
tool_tip="Disable all scripts in this region"
top="30"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="70"
- name="disable_scripts_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Disable Collisions"
@@ -59,16 +49,6 @@
tool_tip="Disable non-avatar collisions in this region"
top="50"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="70"
- name="disable_collisions_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Disable Physics"
@@ -78,16 +58,6 @@
tool_tip="Disable all physics in this region"
top="70"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="70"
- name="disable_physics_help"
- top_delta="2"
- width="18" />
<button
enabled="false"
follows="left|top"
@@ -204,16 +174,6 @@
tool_tip="List of objects experiencing the most potential collisions"
top="313"
width="150" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="top_colliders_help"
- top_delta="2"
- width="18" />
<button
follows="left|top"
font="SansSerifSmall"
@@ -225,16 +185,6 @@
tool_tip="List of objects spending the most time running scripts"
top_pad="5"
width="150" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="top_scripts_help"
- top_delta="2"
- width="18" />
<button
follows="left|top"
font="SansSerifSmall"
@@ -246,16 +196,6 @@
tool_tip="Give 2 minute countdown and restart region"
top_pad="5"
width="130" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="restart_help"
- top_delta="2"
- width="18" />
<button
follows="left|top"
font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index c7a60ed2e48d196acbb601abbe3015f7f493946b..add1476179191b8e1e3b021b91fddc1f275cb4b4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -94,16 +94,6 @@ regions in the estate.
name="use_global_time_check"
top="132"
width="200" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="20"
- name="use_global_time_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Fixed Sun"
@@ -112,16 +102,6 @@ regions in the estate.
name="fixed_sun_check"
top="152"
width="100" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="120"
- name="fixed_sun_help"
- top_delta="2"
- width="18" />
<icon
height="20"
image_name="icon_day_cycle.tga"
@@ -151,16 +131,6 @@ regions in the estate.
name="externally_visible_check"
top_pad="6"
width="200" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="20"
- name="externally_visible_help"
- top_delta="2"
- width="18" />
<text
type="string"
length="1"
@@ -201,16 +171,6 @@ regions in the estate.
name="voice_chat_check"
top="304"
width="200" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="20"
- name="voice_chat_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Direct Teleport"
@@ -219,16 +179,6 @@ regions in the estate.
name="allow_direct_teleport"
top_pad="4"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="140"
- name="allow_direct_teleport_help"
- top_delta="2"
- width="18" />
<text
type="string"
length="1"
@@ -249,16 +199,6 @@ regions in the estate.
name="abuse_email_address"
top_pad="5"
width="205" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="12"
- name="abuse_email_address_help"
- top_dekta="0"
- width="18" />
<button
enabled="false"
follows="left|top"
@@ -300,16 +240,6 @@ regions in the estate.
width="200">
Estate Managers:
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="182"
- name="estate_manager_help"
- top_delta="-1"
- width="18" />
<view_border
bevel_style="none"
follows="top|left"
@@ -357,16 +287,6 @@ regions in the estate.
width="200">
Allowed Residents:
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="182"
- name="allow_resident_help"
- top_delta="-1"
- width="18" />
<view_border
bevel_style="none"
follows="top|left"
@@ -414,16 +334,6 @@ regions in the estate.
width="200">
Allowed Groups:
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="182"
- name="allow_group_help"
- top_delta="-1"
- width="18" />
<view_border
bevel_style="none"
follows="top|left"
@@ -471,16 +381,6 @@ regions in the estate.
width="200">
Banned Residents:
</text>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_delta="182"
- name="ban_resident_help"
- top_delta="-1"
- width="18" />
<view_border
bevel_style="none"
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 160ae96fc4e0b66d7b17bd5c8052a8ff7206a52d..7f477bdc647b3801a7a1481c7824ab3570e77303 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -83,16 +83,6 @@
name="block_terraform_check"
top="70"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="terraform_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Block Fly"
@@ -101,16 +91,6 @@
name="block_fly_check"
top="90"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="fly_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Damage"
@@ -119,16 +99,6 @@
name="allow_damage_check"
top="110"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="damage_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Restrict Pushing"
@@ -137,16 +107,6 @@
name="restrict_pushobject"
top="130"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="restrict_pushobject_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Land Resell"
@@ -155,16 +115,6 @@
name="allow_land_resell_check"
top="160"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="land_resell_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Land Join/Divide"
@@ -173,16 +123,6 @@
name="allow_parcel_changes_check"
top="180"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="parcel_changes_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Block Land Show in Search"
@@ -192,16 +132,6 @@
tool_tip="Let people see this region and its parcels in search results"
top="200"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="parcel_search_help"
- top_delta="2"
- width="18" />
<spinner
follows="left|top"
height="20"
@@ -215,16 +145,6 @@
name="agent_limit_spin"
top="240"
width="170" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="25"
- name="agent_limit_help"
- top_delta="2"
- width="18" />
<spinner
follows="left|top"
height="20"
@@ -238,16 +158,6 @@
name="object_bonus_spin"
top="260"
width="170" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="25"
- name="object_bonus_help"
- top_delta="2"
- width="18" />
<text
follows="left|top"
height="20"
@@ -280,16 +190,6 @@
name="PG"
value="13" />
</combo_box>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="access_help"
- top_delta="2"
- width="18" />
<button
enabled="false"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
index 9b9c62dbf9d6d9928b4f60937813d8b780513233..b199339628d1bf297c1294fa13a9aeb590978504 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
@@ -83,16 +83,6 @@
name="block_terraform_check"
top="70"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="terraform_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Block Fly"
@@ -101,16 +91,6 @@
name="block_fly_check"
top="90"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="fly_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Damage"
@@ -119,16 +99,6 @@
name="allow_damage_check"
top="110"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="damage_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Restrict Pushing"
@@ -137,16 +107,6 @@
name="restrict_pushobject"
top="130"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="restrict_pushobject_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Land Resell"
@@ -155,16 +115,6 @@
name="allow_land_resell_check"
top="160"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="land_resell_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Allow Land Join/Divide"
@@ -173,16 +123,6 @@
name="allow_parcel_changes_check"
top="180"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="parcel_changes_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Block Land Show in Search"
@@ -192,16 +132,6 @@
tool_tip="Let people see this region and its parcels in search results"
top="200"
width="80" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="115"
- name="parcel_search_help"
- top_delta="2"
- width="18" />
<spinner
follows="left|top"
height="20"
@@ -215,16 +145,6 @@
name="agent_limit_spin"
top="240"
width="170" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="25"
- name="agent_limit_help"
- top_delta="2"
- width="18" />
<spinner
follows="left|top"
height="20"
@@ -238,16 +158,6 @@
name="object_bonus_spin"
top="260"
width="170" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="25"
- name="object_bonus_help"
- top_delta="2"
- width="18" />
<text
follows="left|top"
height="20"
@@ -280,16 +190,6 @@
name="PG"
value="13" />
</combo_box>
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="access_help"
- top_delta="2"
- width="18" />
<button
enabled="false"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 148d9500bb8324e8289a0ceacaf6252357502aac..ffd51bf510fc1e60195f15cd00cbeed374fe75ac 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -42,16 +42,6 @@
name="water_height_spin"
top="40"
width="180" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="5"
- name="water_height_help"
- top_delta="2"
- width="18" />
<spinner
follows="left|top"
height="20"
@@ -64,16 +54,6 @@
name="terrain_raise_spin"
top="60"
width="180" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="5"
- name="terrain_raise_help"
- top_delta="2"
- width="18" />
<spinner
follows="left|top"
height="20"
@@ -87,16 +67,6 @@
name="terrain_lower_spin"
top="80"
width="180" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="5"
- name="terrain_lower_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Use Estate Sun"
@@ -105,16 +75,6 @@
name="use_estate_sun_check"
top="35"
width="100" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="70"
- name="use_estate_sun_help"
- top_delta="2"
- width="18" />
<check_box
height="20"
label="Fixed Sun"
@@ -123,16 +83,6 @@
name="fixed_sun_check"
top="55"
width="100" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="70"
- name="fixed_sun_help"
- top_delta="2"
- width="18" />
<icon
height="20"
image_name="icon_day_cycle.tga"
@@ -182,16 +132,6 @@
tool_tip="Available only to estate owners, not managers"
top_pad="60"
width="170" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="download_raw_help"
- top_delta="2"
- width="18" />
<button
follows="left|top"
height="20"
@@ -202,16 +142,6 @@
tool_tip="Available only to estate owners, not managers"
top="243"
width="170" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="upload_raw_help"
- top_delta="2"
- width="18" />
<button
follows="left|top"
height="20"
@@ -222,14 +152,4 @@
tool_tip="Set current terrain as mid-point for raise/lower limits"
top="283"
width="100" />
- <button
- follows="left|top"
- font="SansSerifSmall"
- height="18"
- label="?"
- layout="topleft"
- left_pad="10"
- name="bake_terrain_help"
- top_delta="2"
- width="18" />
</panel>