From f716f71a8266788cfcf1d7570a03104d06bcf97e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 08:02:51 -0700
Subject: Applied show IM logs button from Emerald viewer and added an alert if
 there is no history

---
 linden/indra/newview/llimpanel.cpp                 | 37 ++++++++++++++++++++++
 linden/indra/newview/llimpanel.h                   |  1 +
 .../newview/skins/default/xui/en-us/alerts.xml     |  9 ++++++
 .../default/xui/en-us/floater_instant_message.xml  |  4 ++-
 4 files changed, 50 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 014c050..625da78 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -73,6 +73,7 @@
 #include "llhttpclient.h"
 #include "llmutelist.h"
 #include "llstylemap.h"
+#include <sys/stat.h>
 
 //
 // Constants
@@ -1269,6 +1270,7 @@ BOOL LLFloaterIMPanel::postBuild()
 
 		childSetAction("profile_callee_btn", onClickProfile, this);
 		childSetAction("group_info_btn", onClickGroupInfo, this);
+		childSetAction("history_btn", onClickHistory, this);
 
 		childSetAction("start_call_btn", onClickStartCall, this);
 		childSetAction("end_call_btn", onClickEndCall, this);
@@ -1800,6 +1802,41 @@ void LLFloaterIMPanel::onClickProfile( void* userdata )
 }
 
 // static
+void LLFloaterIMPanel::onClickHistory( void* userdata )
+{
+	LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+	
+	if (self->mOtherParticipantUUID.notNull())
+	{
+		struct stat fileInfo;
+		int result;
+		
+		std::string fullname = self->getTitle();;
+		//gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
+		//if(fullname == "(Loading...)")
+		std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+
+		// check if file exists by trying to get its attributes
+		result = stat(file_path.c_str(), &fileInfo);
+		if(result == 0)
+		{
+			char command[256];
+			sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
+			gViewerWindow->getWindow()->ShellEx(command);
+
+			llinfos << command << llendl;
+		}
+		else
+		{
+			LLStringUtil::format_map_t args;
+			args["[NAME]"] = fullname;
+			gViewerWindow->alertXml("IMLogNotFound", args);
+			llinfos << file_path << llendl;
+		}
+	}
+}
+
+// static
 void LLFloaterIMPanel::onClickGroupInfo( void* userdata )
 {
 	//  Bring up the Profile window
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 0f9c0f3..0699b12 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -230,6 +230,7 @@ public:
 	static void		onTabClick( void* userdata );
 
 	static void		onClickProfile( void* userdata );
+	static void		onClickHistory( void* userdata );
 	static void		onClickGroupInfo( void* userdata );
 	static void		onClickOfferTeleport( void* userdata );
 	static void		onClickClose( void* userdata );
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index edfe62c..24683f0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5222,6 +5222,15 @@ WARNING: Don't restore if you aren't sure where the object will go!
 		</option>
 	</alert>
 
+  <alert modal="true" name="IMLogNotFound">
+    <message name="message">
+      IM history could not be found for [NAME].
+    </message>
+    <option name="OK">
+      OK
+    </option>
+  </alert>
+
   <!-- [RLVa:KB] -->
 	<alert modal="true" name="FirstRLVGiveToRLV">
 		<message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 9a60f57..22e7f1e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -39,9 +39,11 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerif"
 	     halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
 	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="107"
+          name="history_btn" visible="true" width="85" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="107" name="start_call_btn" width="100" />
+	     label="Call" left_delta="92" name="start_call_btn" width="100" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
 	     label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
-- 
cgit v1.1