summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autobuild.xml4
-rw-r--r--indra/newview/llfloaterluadebug.cpp5
-rw-r--r--indra/newview/llluamanager.cpp8
-rw-r--r--scripts/lua/avatar.lua4
-rw-r--r--scripts/lua/demo.lua8
5 files changed, 6 insertions, 23 deletions
diff --git a/autobuild.xml b/autobuild.xml
index ed4525c17a..69f7bf0df0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1685,11 +1685,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
- <string>eb21a1feaf86e14d6a5068ba90b78b7b6b0c4b3c</string>
+ <string>4649604bca29eb697f8a6edb72f8cc1dc8343038</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
- <string>https://api.github.com/repos/secondlife/3p-luau-proto/releases/assets/147845711</string>
+ <string>https://api.github.com/repos/secondlife/3p-luau-proto/releases/assets/148505585</string>
</map>
<key>name</key>
<string>windows64</string>
diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp
index 64f169777d..58639490db 100644
--- a/indra/newview/llfloaterluadebug.cpp
+++ b/indra/newview/llfloaterluadebug.cpp
@@ -63,11 +63,6 @@ BOOL LLFloaterLUADebug::postBuild()
getChild<LLButton>("browse_btn")->setClickedCallback(boost::bind(&LLFloaterLUADebug::onBtnBrowse, this));
getChild<LLButton>("run_btn")->setClickedCallback(boost::bind(&LLFloaterLUADebug::onBtnRun, this));
-#if !LL_WINDOWS
- getChild<LLButton>("execute_btn")->setEnabled(false);
- getChild<LLButton>("browse_btn")->setEnabled(false);
-#endif
-
return TRUE;
}
diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp
index 49bc83c66b..09ca6e10a7 100644
--- a/indra/newview/llluamanager.cpp
+++ b/indra/newview/llluamanager.cpp
@@ -69,14 +69,6 @@ extern LLUIListener sUIListener;
#include "luau/luaconf.h"
#include "luau/lualib.h"
-#if LL_WINDOWS
-#pragma comment(lib, "Luau.Compiler.lib")
-#pragma comment(lib, "Luau.Ast.lib")
-#pragma comment(lib, "Luau.CodeGen.lib")
-#pragma comment(lib, "Luau.Config.lib")
-#pragma comment(lib, "Luau.VM.lib")
-#endif
-
#define lua_register(L, n, f) (lua_pushcfunction(L, (f), n), lua_setglobal(L, (n)))
#define lua_rawlen lua_objlen
diff --git a/scripts/lua/avatar.lua b/scripts/lua/avatar.lua
index 7c419a740c..159014fa04 100644
--- a/scripts/lua/avatar.lua
+++ b/scripts/lua/avatar.lua
@@ -1,4 +1,3 @@
-function call_once_func()
run_ui_command("World.EnvSettings", "midnight")
sleep(1)
run_ui_command("World.EnvSettings", "noon")
@@ -10,5 +9,4 @@ function call_once_func()
sleep(5)
play_animation("Elephant_Fly");
sleep(5)
- play_animation("Elephant_Fly",1);
-end \ No newline at end of file
+ play_animation("Elephant_Fly",1); \ No newline at end of file
diff --git a/scripts/lua/demo.lua b/scripts/lua/demo.lua
index 3442c18b0d..90eaf667bb 100644
--- a/scripts/lua/demo.lua
+++ b/scripts/lua/demo.lua
@@ -139,9 +139,7 @@ function demo_ui()
end
-function call_once_func()
+demo_environment()
+demo_avatar()
+demo_ui()
- demo_environment()
- demo_avatar()
- demo_ui()
-end