7 files changed, 24 insertions, 3 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3a4e29afc1..f7b48d25f2 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -388,6 +388,7 @@ LLAgent::LLAgent() :
 
     mAllowedToStand(true),
     mAllowedToSit(true),
+    mSitObjectID(LLUUID::null),
 
     mAgentAccess(new LLAgentAccess(gSavedSettings)),
     mGodLevelChangeSignal(),
@@ -972,7 +973,11 @@ bool LLAgent::isSitting()
 
 void LLAgent::standUp()
 {
-    if (mAllowedToStand) setControlFlags(AGENT_CONTROL_STAND_UP);
+    if (mAllowedToStand)
+    {
+        setControlFlags(AGENT_CONTROL_STAND_UP);
+        mSitObjectID = LLUUID::null;
+    }
 }
 
 void LLAgent::changeParcels()
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index ca8aaaee86..b475782946 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -450,9 +450,12 @@ public:
     void            setAllowedToStand(bool allow) { mAllowedToStand = allow; }
     bool            isAllowedToSit() const        { return mAllowedToSit; }
     void            setAllowedToSit(bool allow)   { mAllowedToSit = allow; }
+    const LLUUID&   getSitObjectID() const                 { return mSitObjectID; }
+    void            setSitObjectID(const LLUUID& objectID) { mSitObjectID = objectID; }
 private:
     bool            mAllowedToStand;
     bool            mAllowedToSit;
+    LLUUID          mSitObjectID;
 
     //--------------------------------------------------------------------
     // Do Not Disturb
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index c1e8f38c51..9135921acc 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -126,7 +126,7 @@ int main( int argc, char **argv )
     // install unexpected exception handler
     gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
 
-    unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins.
+    //unsetenv( "LD_PRELOAD" ); // <FS:ND/> Get rid of any preloading, we do not want this to happen during startup of plugins.
 
     bool ok = viewer_app_ptr->init();
     if(!ok)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b35be7d385..47d7d42bf7 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4212,6 +4212,8 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
     {
         LL_WARNS("Messaging") << "Received sit approval for unknown object " << sitObjectID << LL_ENDL;
     }
+
+    gAgent.setSitObjectID(sitObjectID);
 }
 
 void process_clear_follow_cam_properties(LLMessageSystem *mesgsys, void **user_data)
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 50e0c95f7b..132aae9b2c 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -93,6 +93,7 @@ namespace Rlv
         Version = 0,
         VersionNew,
         VersionNum,
+        GetSitID,
         Sit,
         SitGround,
         Unsit,
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index dce1471100..122a87ec43 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -227,6 +227,16 @@ ECmdRet ReplyHandler<EBehaviour::VersionNum>::onCommand(const RlvCommand& rlvCmd
     return ECmdRet::Succeeded;
 }
 
+template<> template<>
+ECmdRet ReplyHandler<EBehaviour::GetSitID>::onCommand(const RlvCommand& rlvCmd, std::string& strReply)
+{
+    if (gAgent.isSitting())
+        gAgent.getSitObjectID().toString(strReply);
+    else
+        strReply = "00000000-0000-0000-0000-000000000000";
+    return ECmdRet::Succeeded;
+}
+
 // Force
 
 ECmdRet CommandHandlerBaseImpl<EParamType::Force>::processCommand(const RlvCommand& rlvCmd, ForceHandlerFunc* pHandler)
@@ -284,5 +294,4 @@ ECmdRet BehaviourToggleHandler<EBehaviour::Unsit>::onCommand(const RlvCommand& r
     return ECmdRet::Succeeded;
 }
 
-template<> template<>
 // ============================================================================
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index f26b5a115f..ccb4675cbb 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -50,6 +50,7 @@ BehaviourDictionary::BehaviourDictionary()
     // Reply-only
     //
     addEntry(new ReplyProcessor<EBehaviour::GetCommand>("getcommand"));
+    addEntry(new ReplyProcessor<EBehaviour::GetSitID>("getsitid"));
     addEntry(new ReplyProcessor<EBehaviour::Version, VersionReplyHandler>("version"));
     addEntry(new ReplyProcessor<EBehaviour::VersionNew, VersionReplyHandler>("versionnew"));
     addEntry(new ReplyProcessor<EBehaviour::VersionNum>("versionnum"));