aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-16 10:37:13 +1000
committerDavid Walter Seikel2014-05-16 10:37:13 +1000
commit33d14b8dff91a3f6fcd0e9cc99482251178d42e6 (patch)
tree4a93904286cd5f5b517b0ecee2237ec317c80f24
parentFake llKey2Name(), since there's only one user we know about at the moment. (diff)
downloadSledjHamr-33d14b8dff91a3f6fcd0e9cc99482251178d42e6.zip
SledjHamr-33d14b8dff91a3f6fcd0e9cc99482251178d42e6.tar.gz
SledjHamr-33d14b8dff91a3f6fcd0e9cc99482251178d42e6.tar.bz2
SledjHamr-33d14b8dff91a3f6fcd0e9cc99482251178d42e6.tar.xz
Slightly better faked llDialog(), plus remove newlines from the callers, since that's not handled yet.
-rw-r--r--media/Test sim/objects/onefang%27s%20test%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/~menu.lsl6
-rw-r--r--src/extantz/extantz.c6
-rw-r--r--src/love/love.c1
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() {
119 119
120 120
121unauth(string button, string who) { 121unauth(string button, string who) {
122 llDialog(user0, "\n" + button + " button allowed only for " + who, ["OK"], -1); 122 llDialog(user0, button + " button allowed only for " + who, ["OK"], -1);
123} 123}
124 124
125continMenu(string str) { 125continMenu(string str) {
126 llDialog(user0, "\n"+str+llKey2Name(user)+" is using the menu, continue?", ["Yes","Cancel"], ch - 1); 126 llDialog(user0, str+llKey2Name(user)+" is using the menu, continue?", ["Yes","Cancel"], ch - 1);
127} 127}
128 128
129mainMenu() { 129mainMenu() {
@@ -172,7 +172,7 @@ doMenu(integer inhibit_showing) {
172 + llList2List(buttons1, -9, -7) 172 + llList2List(buttons1, -9, -7)
173 + llList2List(buttons1, -12, -10); 173 + llList2List(buttons1, -12, -10);
174 } 174 }
175 llDialog(user, Version + "\n\n" + llList2String(menus,menu), buttons1, ch - 1); 175 llDialog(user, Version + ":- " + llList2String(menus,menu), buttons1, ch - 1);
176 llResetTime(); 176 llResetTime();
177} 177}
178 178
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)
55 } 55 }
56 else if (0 == strncmp(command, "llDialog(", 9)) 56 else if (0 == strncmp(command, "llDialog(", 9))
57 { 57 {
58 int _M;
59
60 sprintf(buf, "%s: %s", SID, command);
61 lua_getfield(ourGlobals->purkle->L, LUA_REGISTRYINDEX, ourGlobals->purkle->name);
62 _M = lua_gettop(ourGlobals->purkle->L);
63 push_lua(ourGlobals->purkle->L, "@ ( $ )", _M, "append", buf, 0);
58 PI("Dialog from %s - %s", SID, command); 64 PI("Dialog from %s - %s", SID, command);
59 } 65 }
60 else 66 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
368 { 368 {
369 if (ourGlobals->client) sendBack(ourGlobals->client, SID, command); 369 if (ourGlobals->client) sendBack(ourGlobals->client, SID, command);
370 else PW("No where to send %s", command); 370 else PW("No where to send %s", command);
371 PD("DIALOG %s", command);
371 } 372 }
372 else if (0 == strncmp(command, "llMessageLinked(", 16)) 373 else if (0 == strncmp(command, "llMessageLinked(", 16))
373 { 374 {