diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dd94cd20f..aced9c35d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12681,5 +12681,16 @@
473
+ RadarListBtnState
+
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 565a855db..ec8076abe 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -73,12 +73,9 @@ BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVecto
{
if (object && target_type != LOOKAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAt"))
{
- if ((object->getPositionGlobal() - gAgent.getPositionGlobal()).magVec() > 20.0)
- {
- target_type = LOOKAT_TARGET_NONE;
- object = mAvatarObject;
- position.clearVec();
- }
+ target_type = LOOKAT_TARGET_NONE;
+ object = mAvatarObject;
+ position.clearVec();
}
if(object && object->isAttachment())
@@ -114,12 +111,9 @@ BOOL LLAgent::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVec
if (object && target_type != POINTAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAt"))
{
- if ((object->getPositionGlobal() - gAgent.getPositionGlobal()).magVec() > 20.0)
- {
- target_type = POINTAT_TARGET_NONE;
- object = NULL;
- position.clearVec();
- }
+ target_type = POINTAT_TARGET_NONE;
+ object = NULL;
+ position.clearVec();
}
if(!mPointAt || mPointAt->isDead())
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index 33edb3ef2..032491249 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -53,6 +53,7 @@
#include "llfloaterchatterbox.h"
#include "llfloaterfriends.h"
#include "llfloatersnapshot.h"
+#include "llfloateravatarlist.h"
#include "lltoolmgr.h"
#include "llui.h"
#include "llviewermenu.h"
@@ -128,8 +129,8 @@ BOOL LLToolBar::postBuild()
childSetAction("appearance_btn", onClickAppearance, this);
childSetControlName("appearance_btn", "");
- childSetAction("fly_btn", onClickFly, this);
- childSetControlName("fly_btn", "FlyBtnState");
+ childSetAction("radar_list_btn", onClickRadarList, this);
+ childSetControlName("radar_list_btn", "RadarListBtnState");
childSetAction("sit_btn", onClickSit, this);
childSetControlName("sit_btn", "SitBtnState");
@@ -449,6 +450,17 @@ void LLToolBar::onClickAppearance(void*)
}
}
+// static
+void LLToolBar::onClickRadarList(void*)
+{
+ LLFloaterAvatarList::toggle(0);
+ bool vis = false;
+ if(LLFloaterAvatarList::getInstance())
+ {
+ vis = (bool)LLFloaterAvatarList::getInstance()->getVisible();
+ }
+}
+
// static
void LLToolBar::onClickFly(void*)
diff --git a/indra/newview/lltoolbar.h b/indra/newview/lltoolbar.h
index 094d016e3..197d16dd3 100644
--- a/indra/newview/lltoolbar.h
+++ b/indra/newview/lltoolbar.h
@@ -82,6 +82,7 @@ public:
static void onClickRadar(void* data);
static void onClickMap(void* data);
static void onClickInventory(void* data);
+ static void onClickRadarList(void* data);
static F32 sInventoryAutoOpenTime;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 0b228a8af..59c3decfa 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4906,9 +4906,16 @@ class LLWorldSitOnGround : public view_listener_t
{
bool handleEvent(LLPointer event, const LLSD& userdata)
{
- if (gAgent.getAvatarObject() && !gAgent.getAvatarObject()->mIsSitting)
+ if (gAgent.getAvatarObject())
{
- gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+ if(!gAgent.getAvatarObject()->mIsSitting)
+ {
+ gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+ }
+ else
+ {
+ gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+ }
}
return true;
}
@@ -4918,7 +4925,7 @@ class LLWorldEnableSitOnGround : public view_listener_t
{
bool handleEvent(LLPointer event, const LLSD& userdata)
{
- bool new_value = (gAgent.getAvatarObject() && !gAgent.getAvatarObject()->mIsSitting);
+ bool new_value = (gAgent.getAvatarObject());
gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
return true;
}
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 2737bf5d6..6712b3452 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -449,7 +449,7 @@
+ mouse_opaque="true" name="Sit on Ground" shortcut="control|alt|S" width="185">
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
index e97ff8931..6a311094b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
@@ -1,6 +1,6 @@
+ border="true" label="Inert Prefs" name="inert" enabled="true" mouse_opaque="true">
-