aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs6
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs7
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs10
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs7
-rw-r--r--OpenSim/Grid/GridServer/Program.cs6
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs10
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs7
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs9
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs14
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs13
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs3
-rw-r--r--OpenSim/Grid/MessagingServer/WorkUnitBase.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs11
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/FakeScene.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingObject.cs3
-rw-r--r--OpenSim/Grid/ScriptServer/RemotingServer.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs2
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs1
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs10
-rw-r--r--OpenSim/Grid/UserServer/Main.cs10
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs15
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs11
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs17
28 files changed, 84 insertions, 118 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 3a38e85..5a013b9 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -29,6 +29,8 @@ using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
33using log4net.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.AssetLoader.Filesystem; 35using OpenSim.Framework.AssetLoader.Filesystem;
34using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
@@ -42,7 +44,7 @@ namespace OpenSim.Grid.AssetServer
42 /// </summary> 44 /// </summary>
43 public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback 45 public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback
44 { 46 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 48
47 public AssetConfig m_config; 49 public AssetConfig m_config;
48 50
@@ -56,7 +58,7 @@ namespace OpenSim.Grid.AssetServer
56 [STAThread] 58 [STAThread]
57 public static void Main(string[] args) 59 public static void Main(string[] args)
58 { 60 {
59 log4net.Config.XmlConfigurator.Configure(); 61 XmlConfigurator.Configure();
60 62
61 m_log.Info("Starting...\n"); 63 m_log.Info("Starting...\n");
62 64
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index ae56a68..ece826e 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection;
30using System.Text; 31using System.Text;
31using System.Xml; 32using System.Xml;
32using System.Xml.Serialization; 33using System.Xml.Serialization;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using OpenSim.Framework.Statistics; 38using OpenSim.Framework.Statistics;
38 39
@@ -40,7 +41,7 @@ namespace OpenSim.Grid.AssetServer
40{ 41{
41 public class GetAssetStreamHandler : BaseStreamHandler 42 public class GetAssetStreamHandler : BaseStreamHandler
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private OpenAsset_Main m_assetManager; 46 private OpenAsset_Main m_assetManager;
46 private IAssetProvider m_assetProvider; 47 private IAssetProvider m_assetProvider;
@@ -115,7 +116,7 @@ namespace OpenSim.Grid.AssetServer
115 116
116 public class PostAssetStreamHandler : BaseStreamHandler 117 public class PostAssetStreamHandler : BaseStreamHandler
117 { 118 {
118 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 119 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
119 120
120 private OpenAsset_Main m_assetManager; 121 private OpenAsset_Main m_assetManager;
121 private IAssetProvider m_assetProvider; 122 private IAssetProvider m_assetProvider;
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index ba526c0..ee2f129 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -31,18 +31,18 @@ using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using libsecondlife; 33using libsecondlife;
34using log4net;
34using Nwc.XmlRpc; 35using Nwc.XmlRpc;
35using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Data; 36using OpenSim.Data;
38using OpenSim.Framework.Servers;
39using OpenSim.Data.MySQL; 37using OpenSim.Data.MySQL;
38using OpenSim.Framework;
39using OpenSim.Framework.Servers;
40 40
41namespace OpenSim.Grid.GridServer 41namespace OpenSim.Grid.GridServer
42{ 42{
43 public class GridManager 43 public class GridManager
44 { 44 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); 47 private Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
48 private Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); 48 private Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
@@ -630,7 +630,7 @@ namespace OpenSim.Grid.GridServer
630 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData(); 630 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
631 try 631 try
632 { 632 {
633 OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value); 633 MySQLGridData mysqldata = (MySQLGridData)(kvp.Value);
634 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); 634 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
635 DataResponse insertResponse = mysqldata.DeleteProfile(uuid); 635 DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
636 switch (insertResponse) 636 switch (insertResponse)
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 3be98d8..2feaac3 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -26,16 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Timers; 31using System.Timers;
31using System.Collections; 32using Mono.Addins;
32using System.Collections.Generic;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using Nwc.XmlRpc;
37using Mono.Addins;
38using Mono.Addins.Description;
39 36
40namespace OpenSim.Grid.GridServer 37namespace OpenSim.Grid.GridServer
41{ 38{
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index b95e422..6eb4e15 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using System.Text;
31using OpenSim.Framework.Console;
32 30
33namespace OpenSim.Grid.GridServer 31namespace OpenSim.Grid.GridServer
34{ 32{
@@ -37,7 +35,7 @@ namespace OpenSim.Grid.GridServer
37 [STAThread] 35 [STAThread]
38 public static void Main(string[] args) 36 public static void Main(string[] args)
39 { 37 {
40 log4net.Config.XmlConfigurator.Configure(); 38 XmlConfigurator.Configure();
41 39
42 GridServerBase app = new GridServerBase(); 40 GridServerBase app = new GridServerBase();
43 41
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index f7c9828..82ba7df 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Threading; 30using System.Reflection;
31
32using libsecondlife; 31using libsecondlife;
33 32using log4net;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
36using OpenSim.Framework.Console;
37 35
38namespace OpenSim.Grid.InventoryServer 36namespace OpenSim.Grid.InventoryServer
39{ 37{
@@ -42,8 +40,8 @@ namespace OpenSim.Grid.InventoryServer
42 /// </summary> 40 /// </summary>
43 public class GridInventoryService : InventoryServiceBase 41 public class GridInventoryService : InventoryServiceBase
44 { 42 {
45 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 45
48 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 46 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
49 { 47 {
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index ed154a8..b3c6891 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -32,15 +32,15 @@ using System.Text;
32using System.Xml; 32using System.Xml;
33using System.Xml.Serialization; 33using System.Xml.Serialization;
34using libsecondlife; 34using libsecondlife;
35using log4net;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38 38
39namespace OpenSim.Grid.InventoryServer 39namespace OpenSim.Grid.InventoryServer
40{ 40{
41 public class InventoryManager 41 public class InventoryManager
42 { 42 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 private IInventoryData _databasePlugin; 45 private IInventoryData _databasePlugin;
46 46
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 3987334..2454650 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -28,7 +28,10 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
34using log4net.Config;
32using OpenSim.Framework; 35using OpenSim.Framework;
33using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
34using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
@@ -37,7 +40,7 @@ namespace OpenSim.Grid.InventoryServer
37{ 40{
38 public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback 41 public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
39 { 42 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 44
42 private InventoryManager m_inventoryManager; 45 private InventoryManager m_inventoryManager;
43 private InventoryConfig m_config; 46 private InventoryConfig m_config;
@@ -48,7 +51,7 @@ namespace OpenSim.Grid.InventoryServer
48 [STAThread] 51 [STAThread]
49 public static void Main(string[] args) 52 public static void Main(string[] args)
50 { 53 {
51 log4net.Config.XmlConfigurator.Configure(); 54 XmlConfigurator.Configure();
52 55
53 OpenInventory_Main theServer = new OpenInventory_Main(); 56 OpenInventory_Main theServer = new OpenInventory_Main();
54 theServer.Startup(); 57 theServer.Startup();
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index b288b33..bf793bf 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -26,11 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO; 29using System.IO;
30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
33using log4net.Config;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36 37
@@ -40,7 +41,7 @@ namespace OpenSim.Grid.MessagingServer
40 /// </summary> 41 /// </summary>
41 public class OpenMessage_Main : BaseOpenSimServer, conscmd_callback 42 public class OpenMessage_Main : BaseOpenSimServer, conscmd_callback
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private MessageServerConfig Cfg; 46 private MessageServerConfig Cfg;
46 private MessageService msgsvc; 47 private MessageService msgsvc;
@@ -50,7 +51,7 @@ namespace OpenSim.Grid.MessagingServer
50 [STAThread] 51 [STAThread]
51 public static void Main(string[] args) 52 public static void Main(string[] args)
52 { 53 {
53 log4net.Config.XmlConfigurator.Configure(); 54 XmlConfigurator.Configure();
54 55
55 m_log.Info("Launching MessagingServer..."); 56 m_log.Info("Launching MessagingServer...");
56 57
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 1b16cb2..d824d21 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -26,25 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net;
30using System.Net.Sockets;
31using System.Collections; 29using System.Collections;
32using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
33using System.Threading; 33using System.Threading;
34//using System.Xml;
35using libsecondlife; 34using libsecondlife;
35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework;
38using OpenSim.Framework.Console;
39using OpenSim.Data; 37using OpenSim.Data;
40using OpenSim.Framework.Servers; 38using OpenSim.Framework;
41using FriendRights = libsecondlife.FriendRights; 39//using System.Xml;
42 40
43namespace OpenSim.Grid.MessagingServer 41namespace OpenSim.Grid.MessagingServer
44{ 42{
45 public class MessageService 43 public class MessageService
46 { 44 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 46
49 private MessageServerConfig m_cfg; 47 private MessageServerConfig m_cfg;
50 48
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index f270bbe..59d0e13 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -25,18 +25,11 @@
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
28using System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Reflection;
31using System.Net; 30using log4net;
32using System.Net.Sockets;
33using System.Text;
34using libsecondlife;
35using Nwc.XmlRpc; 31using Nwc.XmlRpc;
36using OpenSim.Framework;
37using OpenSim.Framework.Console;
38using OpenSim.Data; 32using OpenSim.Data;
39using OpenSim.Framework.Servers;
40 33
41namespace OpenSim.Grid.MessagingServer 34namespace OpenSim.Grid.MessagingServer
42{ 35{
@@ -44,7 +37,7 @@ namespace OpenSim.Grid.MessagingServer
44 { 37 {
45 public UserPresenceData presence1 = null; 38 public UserPresenceData presence1 = null;
46 public UserPresenceData presence2 = null; 39 public UserPresenceData presence2 = null;
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 41
49 public PresenceInformer() 42 public PresenceInformer()
50 { 43 {
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index 4390903..7188201 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -26,11 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using libsecondlife; 30using libsecondlife;
32using OpenSim.Framework;
33using OpenSim.Data; 31using OpenSim.Data;
32using OpenSim.Framework;
34 33
35namespace OpenSim.Grid.MessagingServer 34namespace OpenSim.Grid.MessagingServer
36{ 35{
diff --git a/OpenSim/Grid/MessagingServer/WorkUnitBase.cs b/OpenSim/Grid/MessagingServer/WorkUnitBase.cs
index c4e6240..d25f044 100644
--- a/OpenSim/Grid/MessagingServer/WorkUnitBase.cs
+++ b/OpenSim/Grid/MessagingServer/WorkUnitBase.cs
@@ -25,10 +25,6 @@
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
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Grid.MessagingServer 28namespace OpenSim.Grid.MessagingServer
33{ 29{
34 public class WorkUnitBase 30 public class WorkUnitBase
diff --git a/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs b/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs
index c54b4d9..c31f0c7 100644
--- a/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs
+++ b/OpenSim/Grid/MessagingServer/WorkUnitPresenceUpdate.cs
@@ -25,10 +25,6 @@
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
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Grid.MessagingServer 28namespace OpenSim.Grid.MessagingServer
33{ 29{
34 public class WorkUnitPresenceUpdate : WorkUnitBase 30 public class WorkUnitPresenceUpdate : WorkUnitBase
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 4a66717..df3bc22 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -27,19 +27,16 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Text; 30using System.Reflection;
31using System.Xml;
32using System.Xml.Serialization;
33using libsecondlife; 31using libsecondlife;
34using OpenSim.Framework; 32using log4net;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
37 34
38namespace OpenSim.Grid.MessagingServer 35namespace OpenSim.Grid.MessagingServer
39{ 36{
40 public class XMPPHTTPStreamHandler : BaseStreamHandler 37 public class XMPPHTTPStreamHandler : BaseStreamHandler
41 { 38 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 40
44 41
45 /// <summary> 42 /// <summary>
@@ -85,7 +82,7 @@ namespace OpenSim.Grid.MessagingServer
85 82
86 public class PostXMPPStreamHandler : BaseStreamHandler 83 public class PostXMPPStreamHandler : BaseStreamHandler
87 { 84 {
88 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 85 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
89 86
90 public override byte[] Handle(string path, Stream request) 87 public override byte[] Handle(string path, Stream request)
91 { 88 {
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 5cf781f..ef93f65 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using log4net.Config;
29 30
30namespace OpenSim.Grid.ScriptServer 31namespace OpenSim.Grid.ScriptServer
31{ 32{
@@ -35,7 +36,7 @@ namespace OpenSim.Grid.ScriptServer
35 36
36 private static void Main(string[] args) 37 private static void Main(string[] args)
37 { 38 {
38 log4net.Config.XmlConfigurator.Configure(); 39 XmlConfigurator.Configure();
39 40
40 AppDomain.CurrentDomain.UnhandledException += 41 AppDomain.CurrentDomain.UnhandledException +=
41 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); 42 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs
index bb2ff4e..480050d 100644
--- a/OpenSim/Grid/ScriptServer/FakeScene.cs
+++ b/OpenSim/Grid/ScriptServer/FakeScene.cs
@@ -25,9 +25,6 @@
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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Framework; 28using OpenSim.Framework;
32using OpenSim.Framework.Communications; 29using OpenSim.Framework.Communications;
33using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index 8cdebe7..9d3065b 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -26,9 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.ScriptEngine.Common; 29using OpenSim.Region.ScriptEngine.Common;
33 30
34namespace OpenSim.Grid.ScriptServer 31namespace OpenSim.Grid.ScriptServer
diff --git a/OpenSim/Grid/ScriptServer/RemotingServer.cs b/OpenSim/Grid/ScriptServer/RemotingServer.cs
index 6d8cc19..7d0e334 100644
--- a/OpenSim/Grid/ScriptServer/RemotingServer.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingServer.cs
@@ -25,13 +25,9 @@
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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Runtime.Remoting; 28using System.Runtime.Remoting;
32using System.Runtime.Remoting.Channels; 29using System.Runtime.Remoting.Channels;
33using System.Runtime.Remoting.Channels.Tcp; 30using System.Runtime.Remoting.Channels.Tcp;
34using OpenSim.Region.ScriptEngine.Common;
35 31
36namespace OpenSim.Grid.ScriptServer 32namespace OpenSim.Grid.ScriptServer
37{ 33{
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index a3d014d..a9679f8 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -25,8 +25,6 @@
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
28using OpenSim.Framework.Console;
29
30namespace OpenSim.Grid.ScriptServer 28namespace OpenSim.Grid.ScriptServer
31{ 29{
32 // Maintains connection and communication to a region 30 // Maintains connection and communication to a region
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index 6cfd6bf..c87352c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Threading; 29using System.Threading;
30using OpenSim.Framework.Console; 30using OpenSim.Framework;
31 31
32namespace OpenSim.Grid.ScriptServer 32namespace OpenSim.Grid.ScriptServer
33{ 33{
@@ -61,7 +61,7 @@ namespace OpenSim.Grid.ScriptServer
61 listenThread.Name = "ListenThread"; 61 listenThread.Name = "ListenThread";
62 listenThread.IsBackground = true; 62 listenThread.IsBackground = true;
63 listenThread.Start(); 63 listenThread.Start();
64 OpenSim.Framework.ThreadTracker.Add(listenThread); 64 ThreadTracker.Add(listenThread);
65 } 65 }
66 66
67 /// <summary> 67 /// <summary>
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
index 6fcf5c8..4d8c559 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -28,14 +28,14 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework.Console; 31using log4net;
32using OpenSim.Region.ScriptEngine.Common; 32using OpenSim.Region.ScriptEngine.Common;
33 33
34namespace OpenSim.Grid.ScriptServer.ScriptServer 34namespace OpenSim.Grid.ScriptServer.ScriptServer
35{ 35{
36 internal class ScriptEngineLoader 36 internal class ScriptEngineLoader
37 { 37 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 39
40 public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName) 40 public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)
41 { 41 {
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
index 2cb46dd..9d67602 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Framework.Console;
30using OpenSim.Region.ScriptEngine.Common; 29using OpenSim.Region.ScriptEngine.Common;
31 30
32namespace OpenSim.Grid.ScriptServer.ScriptServer 31namespace OpenSim.Grid.ScriptServer.ScriptServer
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 12e5f1d..729d262 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -25,10 +25,10 @@
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
28using System.IO; 28using System;
29using System.Reflection;
29using libsecondlife; 30using libsecondlife;
30using Nini.Config; 31using log4net;
31using OpenSim.Framework;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Grid.ScriptServer.ScriptServer; 34using OpenSim.Grid.ScriptServer.ScriptServer;
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.ScriptServer
39{ 39{
40 public class ScriptServerMain : BaseOpenSimServer, conscmd_callback 40 public class ScriptServerMain : BaseOpenSimServer, conscmd_callback
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 // 44 //
45 // Root object. Creates objects used. 45 // Root object. Creates objects used.
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.ScriptServer
77 RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand); 77 RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand);
78 m_TCPServer.StartListen(); 78 m_TCPServer.StartListen();
79 79
80 System.Console.ReadLine(); 80 Console.ReadLine();
81 } 81 }
82 82
83 private void RPC_ReceiveCommand(int ID, string Command, object[] p) 83 private void RPC_ReceiveCommand(int ID, string Command, object[] p)
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 0f0104e..0534e3b 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,7 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection;
31using libsecondlife; 33using libsecondlife;
34using log4net;
35using log4net.Config;
32using OpenSim.Framework; 36using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
@@ -41,7 +45,7 @@ namespace OpenSim.Grid.UserServer
41 /// </summary> 45 /// </summary>
42 public class OpenUser_Main : BaseOpenSimServer, conscmd_callback 46 public class OpenUser_Main : BaseOpenSimServer, conscmd_callback
43 { 47 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 49
46 private UserConfig Cfg; 50 private UserConfig Cfg;
47 51
@@ -54,7 +58,7 @@ namespace OpenSim.Grid.UserServer
54 [STAThread] 58 [STAThread]
55 public static void Main(string[] args) 59 public static void Main(string[] args)
56 { 60 {
57 log4net.Config.XmlConfigurator.Configure(); 61 XmlConfigurator.Configure();
58 62
59 m_log.Info("Launching UserServer..."); 63 m_log.Info("Launching UserServer...");
60 64
@@ -191,7 +195,7 @@ namespace OpenSim.Grid.UserServer
191 } 195 }
192 196
193 } 197 }
194 catch (System.Net.WebException e) 198 catch (WebException e)
195 { 199 {
196 m_log.ErrorFormat( 200 m_log.ErrorFormat(
197 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 201 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6355c4d..22505cb 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -25,23 +25,20 @@
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
28using System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text; 30using System.Net;
32using System.Threading; 31using System.Reflection;
33using libsecondlife; 32using libsecondlife;
33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
39 36
40namespace OpenSim.Grid.UserServer 37namespace OpenSim.Grid.UserServer
41{ 38{
42 public class MessageServersConnector 39 public class MessageServersConnector
43 { 40 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 42
46 public Dictionary<string, MessageServerInfo> MessageServers; 43 public Dictionary<string, MessageServerInfo> MessageServers;
47 44
@@ -214,7 +211,7 @@ namespace OpenSim.Grid.UserServer
214 { 211 {
215 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); 212 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
216 } 213 }
217 catch (System.Net.WebException) 214 catch (WebException)
218 { 215 {
219 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out. Other users might still think this user is online"); 216 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out. Other users might still think this user is online");
220 } 217 }
@@ -249,7 +246,7 @@ namespace OpenSim.Grid.UserServer
249 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); 246 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
250 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login"); 247 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
251 } 248 }
252 catch (System.Net.WebException) 249 catch (WebException)
253 { 250 {
254 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); 251 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user");
255 } 252 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index d7a3b1a..f294dcf 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -28,18 +28,15 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading; 31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
34 35using OpenSim.Data;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Data;
39using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics;
41using OpenSim.Framework.UserManagement; 39using OpenSim.Framework.UserManagement;
42using InventoryFolder=OpenSim.Framework.InventoryFolder;
43 40
44namespace OpenSim.Grid.UserServer 41namespace OpenSim.Grid.UserServer
45{ 42{
@@ -48,7 +45,7 @@ namespace OpenSim.Grid.UserServer
48 45
49 public class UserLoginService : LoginService 46 public class UserLoginService : LoginService
50 { 47 {
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 49
53 public event UserLoggedInAtLocation OnUserLoggedInAtLocation; 50 public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
54 51
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 2a53d7b..aa2c959 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -28,11 +28,12 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
31using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Nwc.XmlRpc; 35using Nwc.XmlRpc;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Statistics;
36using OpenSim.Framework.UserManagement; 37using OpenSim.Framework.UserManagement;
37 38
38namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
@@ -41,7 +42,7 @@ namespace OpenSim.Grid.UserServer
41 42
42 public class UserManager : UserManagerBase 43 public class UserManager : UserManagerBase
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 public event logOffUser OnLogOffUser; 47 public event logOffUser OnLogOffUser;
47 private logOffUser handlerLogOffUser = null; 48 private logOffUser handlerLogOffUser = null;
@@ -389,7 +390,7 @@ namespace OpenSim.Grid.UserServer
389 { 390 {
390 userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]); 391 userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]);
391 } 392 }
392 catch (System.InvalidCastException) 393 catch (InvalidCastException)
393 { 394 {
394 m_log.Error("[PROFILE]:Failed to set home postion x"); 395 m_log.Error("[PROFILE]:Failed to set home postion x");
395 } 396 }
@@ -401,7 +402,7 @@ namespace OpenSim.Grid.UserServer
401 { 402 {
402 userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]); 403 userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]);
403 } 404 }
404 catch (System.InvalidCastException) 405 catch (InvalidCastException)
405 { 406 {
406 m_log.Error("[PROFILE]:Failed to set home postion y"); 407 m_log.Error("[PROFILE]:Failed to set home postion y");
407 } 408 }
@@ -412,7 +413,7 @@ namespace OpenSim.Grid.UserServer
412 { 413 {
413 userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]); 414 userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]);
414 } 415 }
415 catch (System.InvalidCastException) 416 catch (InvalidCastException)
416 { 417 {
417 m_log.Error("[PROFILE]:Failed to set home postion z"); 418 m_log.Error("[PROFILE]:Failed to set home postion z");
418 } 419 }
@@ -423,7 +424,7 @@ namespace OpenSim.Grid.UserServer
423 { 424 {
424 userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]); 425 userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]);
425 } 426 }
426 catch (System.InvalidCastException) 427 catch (InvalidCastException)
427 { 428 {
428 m_log.Error("[PROFILE]:Failed to set home lookat x"); 429 m_log.Error("[PROFILE]:Failed to set home lookat x");
429 } 430 }
@@ -434,7 +435,7 @@ namespace OpenSim.Grid.UserServer
434 { 435 {
435 userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]); 436 userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]);
436 } 437 }
437 catch (System.InvalidCastException) 438 catch (InvalidCastException)
438 { 439 {
439 m_log.Error("[PROFILE]:Failed to set home lookat y"); 440 m_log.Error("[PROFILE]:Failed to set home lookat y");
440 } 441 }
@@ -445,7 +446,7 @@ namespace OpenSim.Grid.UserServer
445 { 446 {
446 userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]); 447 userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]);
447 } 448 }
448 catch (System.InvalidCastException) 449 catch (InvalidCastException)
449 { 450 {
450 m_log.Error("[PROFILE]:Failed to set home lookat z"); 451 m_log.Error("[PROFILE]:Failed to set home lookat z");
451 } 452 }