From 33d14b8dff91a3f6fcd0e9cc99482251178d42e6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 16 May 2014 10:37:13 +1000
Subject: Slightly better faked llDialog(), plus remove newlines from the
 callers, since that's not handled yet.

---
 .../~menu.lsl                                                       | 6 +++---
 src/extantz/extantz.c                                               | 6 ++++++
 src/love/love.c                                                     | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/media/Test sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl b/media/Test sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl
index e4d5f0e..e733e96 100644
--- a/media/Test sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl	
+++ b/media/Test sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl	
@@ -119,11 +119,11 @@ setup_pose() {
 
 
 unauth(string button, string who) {
-        llDialog(user0, "\n" + button + " button allowed only for " + who, ["OK"], -1);
+        llDialog(user0, button + " button allowed only for " + who, ["OK"], -1);
 }
 
 continMenu(string str) {
-    llDialog(user0, "\n"+str+llKey2Name(user)+" is using the menu, continue?", ["Yes","Cancel"], ch - 1);
+    llDialog(user0, str+llKey2Name(user)+" is using the menu, continue?", ["Yes","Cancel"], ch - 1);
 }
 
 mainMenu() {
@@ -172,7 +172,7 @@ doMenu(integer inhibit_showing) {
             + llList2List(buttons1, -9, -7)
             + llList2List(buttons1, -12, -10);
     }
-    llDialog(user, Version + "\n\n" + llList2String(menus,menu), buttons1, ch - 1);
+    llDialog(user, Version + ":- " + llList2String(menus,menu), buttons1, ch - 1);
     llResetTime();
 }
 
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index cfda98c..e66750c 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -55,6 +55,12 @@ static Eina_Bool _data(void *data, int type, Ecore_Con_Event_Server_Data *ev)
 	}
 	else if (0 == strncmp(command, "llDialog(", 9))
 	{
+	  int _M;
+
+	  sprintf(buf, "%s: %s", SID, command);
+	  lua_getfield(ourGlobals->purkle->L, LUA_REGISTRYINDEX, ourGlobals->purkle->name);
+	  _M = lua_gettop(ourGlobals->purkle->L);
+	  push_lua(ourGlobals->purkle->L, "@ ( $ )", _M, "append", buf, 0);
 	  PI("Dialog from %s - %s", SID, command);
 	}
 	else
diff --git a/src/love/love.c b/src/love/love.c
index 113118c..aede741 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -368,6 +368,7 @@ static Eina_Bool _dataLuaSL(void *data, int type, Ecore_Con_Event_Server_Data *e
 		{
 		    if (ourGlobals->client)  sendBack(ourGlobals->client, SID, command);
 		    else PW("No where to send %s", command);
+		    PD("DIALOG %s", command);
 		}
 		else if (0 == strncmp(command, "llMessageLinked(", 16))
 		{
-- 
cgit v1.1