Update test scripts to reference UI.Floater, not standalone Floater.

6 files changed, 11 insertions, 12 deletions

diff --git a/indra/newview/scripts/lua/require/LLChatListener.lua b/indra/newview/scripts/lua/require/LLChatListener.lua
index 428dca881e..82b28966ce 100644
--- a/indra/newview/scripts/lua/require/LLChatListener.lua
+++ b/indra/newview/scripts/lua/require/LLChatListener.lua
@@ -23,7 +23,7 @@ function LLChatListener:handleMessages(event_data)
 end
 
 function LLChatListener:start()
-    waitfor = leap.WaitFor:new(-1, self.name)
+    waitfor = leap.WaitFor(-1, self.name)
     function waitfor:filter(pump, data)
         if pump == "LLNearbyChat" then
           return data
diff --git a/indra/newview/scripts/lua/test_LLAppearance.lua b/indra/newview/scripts/lua/test_LLAppearance.lua
index 5ddd9f15ff..a97ec4e0ca 100644
--- a/indra/newview/scripts/lua/test_LLAppearance.lua
+++ b/indra/newview/scripts/lua/test_LLAppearance.lua
@@ -1,7 +1,7 @@
-local Floater = require 'Floater'
 local LLAppearance = require 'LLAppearance'
 local startup = require 'startup'
 local inspect = require 'inspect'
+local UI = require 'UI'
 
 local SHOW_OUTFITS = true
 local SELECTED_OUTFIT_ID = {}
@@ -15,7 +15,7 @@ local outfits_title = 'Outfits'
 local wear_lbl = 'Wear item'
 local detach_lbl = 'Detach item'
 
-local flt = Floater:new(
+local flt = UI.Floater(
     "luafloater_outfits_list.xml",
     {outfits_list = {"double_click"}})
 
diff --git a/indra/newview/scripts/lua/test_camera_control.lua b/indra/newview/scripts/lua/test_camera_control.lua
index 9b35cdf8cd..7ac0986ee6 100644
--- a/indra/newview/scripts/lua/test_camera_control.lua
+++ b/indra/newview/scripts/lua/test_camera_control.lua
@@ -1,8 +1,8 @@
-local Floater = require 'Floater'
 local LLAgent = require 'LLAgent'
 local startup = require 'startup'
+local UI = require 'UI'
 
-local flt = Floater('luafloater_camera_control.xml')
+local flt = UI.Floater('luafloater_camera_control.xml')
 
 function getValue(ctrl_name)
     return flt:request({action="get_value", ctrl_name=ctrl_name}).value
diff --git a/indra/newview/scripts/lua/test_luafloater_demo.lua b/indra/newview/scripts/lua/test_luafloater_demo.lua
index 3903d01e65..2158134511 100644
--- a/indra/newview/scripts/lua/test_luafloater_demo.lua
+++ b/indra/newview/scripts/lua/test_luafloater_demo.lua
@@ -1,8 +1,8 @@
-local Floater = require 'Floater'
 local leap = require 'leap'
 local startup = require 'startup'
+local UI = require 'UI'
 
-local flt = Floater(
+local flt = UI.Floater(
     'luafloater_demo.xml',
     {show_time_lbl = {"right_mouse_down", "double_click"}})
 
@@ -10,7 +10,7 @@ local flt = Floater(
 function flt:handleEvents(event_data)
     self:post({action="add_text", ctrl_name="events_editor", value = event_data})
     -- forward the call to base-class handleEvents()
-    return Floater.handleEvents(self, event_data)
+    return UI.Floater.handleEvents(self, event_data)
 end
 
 function flt:commit_disable_ctrl(event_data)
diff --git a/indra/newview/scripts/lua/test_luafloater_gesture_list.lua b/indra/newview/scripts/lua/test_luafloater_gesture_list.lua
index bd397ef2a6..5f929c0d0c 100644
--- a/indra/newview/scripts/lua/test_luafloater_gesture_list.lua
+++ b/indra/newview/scripts/lua/test_luafloater_gesture_list.lua
@@ -1,8 +1,8 @@
-local Floater = require 'Floater'
 local LLGesture = require 'LLGesture'
 local startup = require 'startup'
+local UI = require 'UI'
 
-local flt = Floater(
+local flt = UI.Floater(
     "luafloater_gesture_list.xml",
     {gesture_list = {"double_click"}})
 
diff --git a/indra/newview/scripts/lua/test_luafloater_speedometer.lua b/indra/newview/scripts/lua/test_luafloater_speedometer.lua
index 8bc18ad286..2cdd41fd7e 100644
--- a/indra/newview/scripts/lua/test_luafloater_speedometer.lua
+++ b/indra/newview/scripts/lua/test_luafloater_speedometer.lua
@@ -1,11 +1,10 @@
-local Floater = require 'Floater'
 local leap = require 'leap'
 local startup = require 'startup'
 local Timer = (require 'timers').Timer
 local UI = require 'UI'
 local popup = UI.popup
 local max_speed = 0
-local flt = Floater("luafloater_speedometer.xml")
+local flt = UI.Floater("luafloater_speedometer.xml")
 startup.wait('STATE_STARTED')
 
 local timer