diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-07 15:06:41 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-07 15:06:41 -0400 |
| commit | 654d5cd1676a8a229a6ae4b8a61f1fe9bfbb8c1d (patch) | |
| tree | cfac95fb61628242b466b4b9ad28b49cc708a68a /indra/newview/scripts/lua | |
| parent | ec092bb626ecb2f293343e35209b31e363de6a5d (diff) | |
| parent | 78e987883ac3b82466e603c5535fc0332736a0c2 (diff) | |
Merge branch 'release/luau-scripting' into viewer-lua-smoother
Diffstat (limited to 'indra/newview/scripts/lua')
| -rw-r--r-- | indra/newview/scripts/lua/require/Region.lua | 17 | ||||
| -rw-r--r-- | indra/newview/scripts/lua/require/login.lua | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/scripts/lua/require/Region.lua b/indra/newview/scripts/lua/require/Region.lua new file mode 100644 index 0000000000..e4eefece33 --- /dev/null +++ b/indra/newview/scripts/lua/require/Region.lua @@ -0,0 +1,17 @@ +LLFloaterAbout = require 'LLFloaterAbout' + +local Region = {} + +function Region.getInfo() + info = LLFloaterAbout.getInfo() + return { + HOSTNAME=info.HOSTNAME, + POSITION=info.POSITION, + POSITION_LOCAL=info.POSITION_LOCAL, + REGION=info.REGION, + SERVER_VERSION=info.SERVER_VERSION, + SLURL=info.SLURL, + } +end + +return Region diff --git a/indra/newview/scripts/lua/require/login.lua b/indra/newview/scripts/lua/require/login.lua index 50fc9e3793..919434f3a5 100644 --- a/indra/newview/scripts/lua/require/login.lua +++ b/indra/newview/scripts/lua/require/login.lua @@ -27,7 +27,7 @@ end function login.savedLogins(grid) ensure_login_state('savedLogins') - return leap.request('LLPanelLogin', {op='savedLogins'})['logins'] + return leap.request('LLPanelLogin', {op='savedLogins', grid=grid})['logins'] end return login |