aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs228
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
3 files changed, 117 insertions, 117 deletions
diff --git a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
index 6b5d3a8..44a4f29 100644
--- a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
@@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Grid.ScriptEngine.Common")] 8[assembly: AssemblyTitle("OpenSim.Grid.ScriptEngine.Common")]
9[assembly: AssemblyDescription("")] 9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")] 10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")] 11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenSim.Grid.ScriptEngine.Common")] 12[assembly: AssemblyProduct("OpenSim.Grid.ScriptEngine.Common")]
13[assembly: AssemblyCopyright("Copyright © 2007")] 13[assembly: AssemblyCopyright("Copyright © 2007")]
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
index b9a5c97..b18bda2 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
@@ -1,114 +1,114 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32 32
33namespace OpenSim.Grid.ScriptServer 33namespace OpenSim.Grid.ScriptServer
34{ 34{
35 public abstract class RegionBase 35 public abstract class RegionBase
36 { 36 {
37 // These are events that the region needs to have 37 // These are events that the region needs to have
38 38
39 // TEMP: Using System.Delegate -- needs replacing with a real delegate 39 // TEMP: Using System.Delegate -- needs replacing with a real delegate
40 public delegate void DefaultDelegate(); 40 public delegate void DefaultDelegate();
41 41
42 public event DefaultDelegate onScriptRez; 42 public event DefaultDelegate onScriptRez;
43 public event DefaultDelegate onstate_entry; 43 public event DefaultDelegate onstate_entry;
44 public event DefaultDelegate onstate_exit; 44 public event DefaultDelegate onstate_exit;
45 public event DefaultDelegate ontouch_start; 45 public event DefaultDelegate ontouch_start;
46 public event DefaultDelegate ontouch; 46 public event DefaultDelegate ontouch;
47 public event DefaultDelegate ontouch_end; 47 public event DefaultDelegate ontouch_end;
48 public event DefaultDelegate oncollision_start; 48 public event DefaultDelegate oncollision_start;
49 public event DefaultDelegate oncollision; 49 public event DefaultDelegate oncollision;
50 public event DefaultDelegate oncollision_end; 50 public event DefaultDelegate oncollision_end;
51 public event DefaultDelegate onland_collision_start; 51 public event DefaultDelegate onland_collision_start;
52 public event DefaultDelegate onland_collision; 52 public event DefaultDelegate onland_collision;
53 public event DefaultDelegate onland_collision_end; 53 public event DefaultDelegate onland_collision_end;
54 public event DefaultDelegate ontimer; 54 public event DefaultDelegate ontimer;
55 public event DefaultDelegate onlisten; 55 public event DefaultDelegate onlisten;
56 public event DefaultDelegate onon_rez; 56 public event DefaultDelegate onon_rez;
57 public event DefaultDelegate onsensor; 57 public event DefaultDelegate onsensor;
58 public event DefaultDelegate onno_sensor; 58 public event DefaultDelegate onno_sensor;
59 public event DefaultDelegate oncontrol; 59 public event DefaultDelegate oncontrol;
60 public event DefaultDelegate onmoney; 60 public event DefaultDelegate onmoney;
61 public event DefaultDelegate onemail; 61 public event DefaultDelegate onemail;
62 public event DefaultDelegate onat_target; 62 public event DefaultDelegate onat_target;
63 public event DefaultDelegate onnot_at_target; 63 public event DefaultDelegate onnot_at_target;
64 public event DefaultDelegate onat_rot_target; 64 public event DefaultDelegate onat_rot_target;
65 public event DefaultDelegate onnot_at_rot_target; 65 public event DefaultDelegate onnot_at_rot_target;
66 public event DefaultDelegate onrun_time_permissions; 66 public event DefaultDelegate onrun_time_permissions;
67 public event DefaultDelegate onchanged; 67 public event DefaultDelegate onchanged;
68 public event DefaultDelegate onattach; 68 public event DefaultDelegate onattach;
69 public event DefaultDelegate ondataserver; 69 public event DefaultDelegate ondataserver;
70 public event DefaultDelegate onlink_message; 70 public event DefaultDelegate onlink_message;
71 public event DefaultDelegate onmoving_start; 71 public event DefaultDelegate onmoving_start;
72 public event DefaultDelegate onmoving_end; 72 public event DefaultDelegate onmoving_end;
73 public event DefaultDelegate onobject_rez; 73 public event DefaultDelegate onobject_rez;
74 public event DefaultDelegate onremote_data; 74 public event DefaultDelegate onremote_data;
75 public event DefaultDelegate onhttp_response; 75 public event DefaultDelegate onhttp_response;
76 76
77 77
78 public void ScriptRez() { onScriptRez(); } 78 public void ScriptRez() { onScriptRez(); }
79 public void state_entry() { onstate_entry(); } 79 public void state_entry() { onstate_entry(); }
80 public void state_exit() { onstate_exit(); } 80 public void state_exit() { onstate_exit(); }
81 public void touch_start() { ontouch_start(); } 81 public void touch_start() { ontouch_start(); }
82 public void touch() { ontouch(); } 82 public void touch() { ontouch(); }
83 public void touch_end() { ontouch_end(); } 83 public void touch_end() { ontouch_end(); }
84 public void collision_start() { oncollision_start(); } 84 public void collision_start() { oncollision_start(); }
85 public void collision() { oncollision(); } 85 public void collision() { oncollision(); }
86 public void collision_end() { oncollision_end(); } 86 public void collision_end() { oncollision_end(); }
87 public void land_collision_start() { onland_collision_start(); } 87 public void land_collision_start() { onland_collision_start(); }
88 public void land_collision() { onland_collision(); } 88 public void land_collision() { onland_collision(); }
89 public void land_collision_end() { onland_collision_end(); } 89 public void land_collision_end() { onland_collision_end(); }
90 public void timer() { ontimer(); } 90 public void timer() { ontimer(); }
91 public void listen() { onlisten(); } 91 public void listen() { onlisten(); }
92 public void on_rez() { onon_rez(); } 92 public void on_rez() { onon_rez(); }
93 public void sensor() { onsensor(); } 93 public void sensor() { onsensor(); }
94 public void no_sensor() { onno_sensor(); } 94 public void no_sensor() { onno_sensor(); }
95 public void control() { oncontrol(); } 95 public void control() { oncontrol(); }
96 public void money() { onmoney(); } 96 public void money() { onmoney(); }
97 public void email() { onemail(); } 97 public void email() { onemail(); }
98 public void at_target() { onat_target(); } 98 public void at_target() { onat_target(); }
99 public void not_at_target() { onnot_at_target(); } 99 public void not_at_target() { onnot_at_target(); }
100 public void at_rot_target() { onat_rot_target(); } 100 public void at_rot_target() { onat_rot_target(); }
101 public void not_at_rot_target() { onnot_at_rot_target(); } 101 public void not_at_rot_target() { onnot_at_rot_target(); }
102 public void run_time_permissions() { onrun_time_permissions(); } 102 public void run_time_permissions() { onrun_time_permissions(); }
103 public void changed() { onchanged(); } 103 public void changed() { onchanged(); }
104 public void attach() { onattach(); } 104 public void attach() { onattach(); }
105 public void dataserver() { ondataserver(); } 105 public void dataserver() { ondataserver(); }
106 public void link_message() { onlink_message(); } 106 public void link_message() { onlink_message(); }
107 public void moving_start() { onmoving_start(); } 107 public void moving_start() { onmoving_start(); }
108 public void moving_end() { onmoving_end(); } 108 public void moving_end() { onmoving_end(); }
109 public void object_rez() { onobject_rez(); } 109 public void object_rez() { onobject_rez(); }
110 public void remote_data() { onremote_data(); } 110 public void remote_data() { onremote_data(); }
111 public void http_response() { onhttp_response(); } 111 public void http_response() { onhttp_response(); }
112 112
113 } 113 }
114} 114}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 10a8974..2aecfa2 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Grid.UserServer
56 /// <param name="theUser">The user profile</param> 56 /// <param name="theUser">The user profile</param>
57 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) 57 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
58 { 58 {
59 // Load information from the gridserver 59 // Load information from the gridserver
60 RegionProfileData SimInfo = new RegionProfileData(); 60 RegionProfileData SimInfo = new RegionProfileData();
61 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); 61 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
62 62