diff options
Diffstat (limited to '')
4 files changed, 20 insertions, 10 deletions
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs index 4892b8e..64a9b0d 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs | |||
@@ -32,7 +32,7 @@ namespace OpenGridServices.Manager | |||
32 | { | 32 | { |
33 | public partial class MainWindow: Gtk.Window | 33 | public partial class MainWindow: Gtk.Window |
34 | { | 34 | { |
35 | public MainWindow (): base (Gtk.WindowType.Toplevel) | 35 | public MainWindow() : base (Gtk.WindowType.Toplevel) |
36 | { | 36 | { |
37 | Build(); | 37 | Build(); |
38 | } | 38 | } |
@@ -57,10 +57,13 @@ namespace OpenGridServices.Manager | |||
57 | 57 | ||
58 | public void SetGridServerConnected(bool connected) | 58 | public void SetGridServerConnected(bool connected) |
59 | { | 59 | { |
60 | if (connected) { | 60 | if (connected) |
61 | { | ||
61 | this.ConnectToGridserver.Visible=false; | 62 | this.ConnectToGridserver.Visible=false; |
62 | this.DisconnectFromGridServer.Visible=true; | 63 | this.DisconnectFromGridServer.Visible=true; |
63 | } else { | 64 | } |
65 | else | ||
66 | { | ||
64 | this.ConnectToGridserver.Visible=true; | 67 | this.ConnectToGridserver.Visible=true; |
65 | this.DisconnectFromGridServer.Visible=false; | 68 | this.DisconnectFromGridServer.Visible=false; |
66 | } | 69 | } |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_Builtins.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_Builtins.cs index d2e565d..a551fde 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_Builtins.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_Builtins.cs | |||
@@ -35,24 +35,29 @@ | |||
35 | // { | 35 | // { |
36 | 36 | ||
37 | 37 | ||
38 | // public float llSin() { | 38 | // public float llSin() |
39 | // { | ||
39 | // float f = (float)LSLStack.Pop(); | 40 | // float f = (float)LSLStack.Pop(); |
40 | // return LSL_Builtins.llSin(f); | 41 | // return LSL_Builtins.llSin(f); |
41 | // } | 42 | // } |
42 | // public float llCos() { | 43 | // public float llCos() |
44 | // { | ||
43 | // float f = (float)LSLStack.Pop(); | 45 | // float f = (float)LSLStack.Pop(); |
44 | // return LSL_Builtins.llCos(f); | 46 | // return LSL_Builtins.llCos(f); |
45 | // } | 47 | // } |
46 | // public float llTan() { | 48 | // public float llTan() |
49 | // { | ||
47 | // float f = (float)LSLStack.Pop(); | 50 | // float f = (float)LSLStack.Pop(); |
48 | // return LSL_Builtins.llTan(f); | 51 | // return LSL_Builtins.llTan(f); |
49 | // } | 52 | // } |
50 | // public float llAtan2() { | 53 | // public float llAtan2() |
54 | // { | ||
51 | // float x = (float)LSLStack.Pop(); | 55 | // float x = (float)LSLStack.Pop(); |
52 | // float y = (float)LSLStack.Pop(); | 56 | // float y = (float)LSLStack.Pop(); |
53 | // return LSL_Builtins.llAtan2(x, y); | 57 | // return LSL_Builtins.llAtan2(x, y); |
54 | // } | 58 | // } |
55 | // public float llSqrt() { | 59 | // public float llSqrt() |
60 | // { | ||
56 | // float f = (float)LSLStack.Pop(); | 61 | // float f = (float)LSLStack.Pop(); |
57 | // return LSL_Builtins.llSqrt(f); | 62 | // return LSL_Builtins.llSqrt(f); |
58 | // } | 63 | // } |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Enums.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Enums.cs index c679e49..97ccc18 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Enums.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Enums.cs | |||
@@ -34,7 +34,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
34 | { | 34 | { |
35 | //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types; | 35 | //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types; |
36 | 36 | ||
37 | //LSO_Enums() { | 37 | //LSO_Enums() |
38 | //{ | ||
38 | // OpCode_Add_Types.Add(51, typeof(String)); | 39 | // OpCode_Add_Types.Add(51, typeof(String)); |
39 | // OpCode_Add_Types.Add(17, typeof(UInt32)); | 40 | // OpCode_Add_Types.Add(17, typeof(UInt32)); |
40 | //} | 41 | //} |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index b123b8c..32b1ada 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -163,7 +163,8 @@ namespace OpenSim.Grid.UserServer | |||
163 | 163 | ||
164 | theUser.CurrentAgent.Region = SimInfo.UUID; | 164 | theUser.CurrentAgent.Region = SimInfo.UUID; |
165 | theUser.CurrentAgent.Handle = SimInfo.regionHandle; | 165 | theUser.CurrentAgent.Handle = SimInfo.regionHandle; |
166 | if (start_x >= 0 && start_y >= 0 && start_z >= 0) { | 166 | if (start_x >= 0 && start_y >= 0 && start_z >= 0) |
167 | { | ||
167 | LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z); | 168 | LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z); |
168 | theUser.CurrentAgent.Position = tmp_v; | 169 | theUser.CurrentAgent.Position = tmp_v; |
169 | } | 170 | } |