aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authormingchen2007-07-05 15:15:28 +0000
committermingchen2007-07-05 15:15:28 +0000
commit583f2a9de8e503773a427facd5f81a82b40bd585 (patch)
tree35d434db32056e7d0b231f56f2732c031c130a1d /OpenSim/Framework
parent* Tweaks to Java engine (uses less threads). Added support for OnFrame and On... (diff)
downloadopensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.zip
opensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.tar.gz
opensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.tar.bz2
opensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.tar.xz
*Removed SimProfile.cs as it is no longer needed (in favor of SimProfileData)
*Added simulator_data_request XMLRPC method to request data from the grid server about a sim instead of faking its login *Login is progressing, now just getting an XML error (http://pastebin.com/942515) -- if you can fix this, throw MingChen in IRC a Private Message
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj6
-rw-r--r--OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build4
-rw-r--r--OpenSim/Framework/Console/OpenSim.Framework.Console.csproj4
-rw-r--r--OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build2
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj6
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build2
-rw-r--r--OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj10
-rw-r--r--OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build6
-rw-r--r--OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj4
-rw-r--r--OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build2
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.csproj46
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build4
-rw-r--r--OpenSim/Framework/Data/SimProfileData.cs70
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj61
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.dll.build39
-rw-r--r--OpenSim/Framework/General/SimProfile.cs119
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs4
17 files changed, 174 insertions, 215 deletions
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..0ee62e9 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
86 </ProjectReference> 86 </ProjectReference>
87 </ItemGroup> 87 </ItemGroup>
88 <ItemGroup> 88 <ItemGroup>
89 <Compile Include="CommunicationsManager.cs"> 89 <Compile Include="IUserServices.cs">
90 <SubType>Code</SubType> 90 <SubType>Code</SubType>
91 </Compile> 91 </Compile>
92 <Compile Include="IGridServices.cs"> 92 <Compile Include="IGridServices.cs">
93 <SubType>Code</SubType> 93 <SubType>Code</SubType>
94 </Compile> 94 </Compile>
95 <Compile Include="IInterRegionCommunications.cs"> 95 <Compile Include="CommunicationsManager.cs">
96 <SubType>Code</SubType> 96 <SubType>Code</SubType>
97 </Compile> 97 </Compile>
98 <Compile Include="IUserServices.cs"> 98 <Compile Include="IInterRegionCommunications.cs">
99 <SubType>Code</SubType> 99 <SubType>Code</SubType>
100 </Compile> 100 </Compile>
101 <Compile Include="Properties\AssemblyInfo.cs"> 101 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6..8b0e0f6 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
11 <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="CommunicationsManager.cs" /> 14 <include name="IUserServices.cs" />
15 <include name="IGridServices.cs" /> 15 <include name="IGridServices.cs" />
16 <include name="CommunicationsManager.cs" />
16 <include name="IInterRegionCommunications.cs" /> 17 <include name="IInterRegionCommunications.cs" />
17 <include name="IUserServices.cs" />
18 <include name="Properties/AssemblyInfo.cs" /> 18 <include name="Properties/AssemblyInfo.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index f3dcec5..c02a506 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
69 <Compile Include="AssemblyInfo.cs"> 69 <Compile Include="AssemblyInfo.cs">
70 <SubType>Code</SubType> 70 <SubType>Code</SubType>
71 </Compile> 71 </Compile>
72 <Compile Include="ConsoleCallbacksBase.cs"> 72 <Compile Include="LogBase.cs">
73 <SubType>Code</SubType> 73 <SubType>Code</SubType>
74 </Compile> 74 </Compile>
75 <Compile Include="LogBase.cs"> 75 <Compile Include="ConsoleCallbacksBase.cs">
76 <SubType>Code</SubType> 76 <SubType>Code</SubType>
77 </Compile> 77 </Compile>
78 <Compile Include="MainLog.cs"> 78 <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index eb40c0d..10e72a1 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="ConsoleCallbacksBase.cs" />
16 <include name="LogBase.cs" /> 15 <include name="LogBase.cs" />
16 <include name="ConsoleCallbacksBase.cs" />
17 <include name="MainLog.cs" /> 17 <include name="MainLog.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf..c7b4870 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="DB4oGridData.cs"> 91 <Compile Include="DB4oUserData.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="DB4oManager.cs"> 94 <Compile Include="DB4oGridData.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="DB4oUserData.cs"> 97 <Compile Include="DB4oManager.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="Properties\AssemblyInfo.cs"> 100 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5..efccdc1 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
11 <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="DB4oUserData.cs" />
14 <include name="DB4oGridData.cs" /> 15 <include name="DB4oGridData.cs" />
15 <include name="DB4oManager.cs" /> 16 <include name="DB4oManager.cs" />
16 <include name="DB4oUserData.cs" />
17 <include name="Properties/AssemblyInfo.cs" /> 17 <include name="Properties/AssemblyInfo.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..09a32b5 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="MySQLGridData.cs">
92 <SubType>Code</SubType>
93 </Compile>
94 <Compile Include="MySQLInventoryData.cs"> 91 <Compile Include="MySQLInventoryData.cs">
95 <SubType>Code</SubType> 92 <SubType>Code</SubType>
96 </Compile> 93 </Compile>
97 <Compile Include="MySQLLogData.cs"> 94 <Compile Include="MySQLUserData.cs">
98 <SubType>Code</SubType> 95 <SubType>Code</SubType>
99 </Compile> 96 </Compile>
100 <Compile Include="MySQLManager.cs"> 97 <Compile Include="MySQLManager.cs">
101 <SubType>Code</SubType> 98 <SubType>Code</SubType>
102 </Compile> 99 </Compile>
103 <Compile Include="MySQLUserData.cs"> 100 <Compile Include="MySQLLogData.cs">
101 <SubType>Code</SubType>
102 </Compile>
103 <Compile Include="MySQLGridData.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="Properties\AssemblyInfo.cs"> 106 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec52..3aeebbc 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
11 <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="MySQLGridData.cs" />
15 <include name="MySQLInventoryData.cs" /> 14 <include name="MySQLInventoryData.cs" />
16 <include name="MySQLLogData.cs" />
17 <include name="MySQLManager.cs" />
18 <include name="MySQLUserData.cs" /> 15 <include name="MySQLUserData.cs" />
16 <include name="MySQLManager.cs" />
17 <include name="MySQLLogData.cs" />
18 <include name="MySQLGridData.cs" />
19 <include name="Properties/AssemblyInfo.cs" /> 19 <include name="Properties/AssemblyInfo.cs" />
20 </sources> 20 </sources>
21 <references basedir="${project::get-base-directory()}"> 21 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..dab22ea 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="SQLiteGridData.cs"> 91 <Compile Include="SQLiteManager.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="SQLiteManager.cs"> 94 <Compile Include="SQLiteGridData.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="Properties\AssemblyInfo.cs"> 97 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6..719fbc6 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="SQLiteGridData.cs" />
15 <include name="SQLiteManager.cs" /> 14 <include name="SQLiteManager.cs" />
15 <include name="SQLiteGridData.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcd..6077266 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Framework.Data</AssemblyName> 13 <AssemblyName>OpenSim.Framework.Data</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Framework.Data</RootNamespace> 21 <RootNamespace>OpenSim.Framework.Data</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,29 +61,34 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System" > 72 <Reference Include="System">
66 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Data" > 76 <Reference Include="System.Data">
70 <HintPath>System.Data.dll</HintPath> 77 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System.Xml" > 80 <Reference Include="System.Xml">
74 <HintPath>System.Xml.dll</HintPath> 81 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
84 <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
77 </ItemGroup> 85 </ItemGroup>
78 <ItemGroup> 86 <ItemGroup>
79 </ItemGroup> 87 </ItemGroup>
80 <ItemGroup> 88 <ItemGroup>
89 <Compile Include="ReservationData.cs">
90 <SubType>Code</SubType>
91 </Compile>
81 <Compile Include="GridData.cs"> 92 <Compile Include="GridData.cs">
82 <SubType>Code</SubType> 93 <SubType>Code</SubType>
83 </Compile> 94 </Compile>
@@ -90,18 +101,15 @@
90 <Compile Include="InventoryData.cs"> 101 <Compile Include="InventoryData.cs">
91 <SubType>Code</SubType> 102 <SubType>Code</SubType>
92 </Compile> 103 </Compile>
93 <Compile Include="ReservationData.cs">
94 <SubType>Code</SubType>
95 </Compile>
96 <Compile Include="SimProfileData.cs">
97 <SubType>Code</SubType>
98 </Compile>
99 <Compile Include="UserData.cs"> 104 <Compile Include="UserData.cs">
100 <SubType>Code</SubType> 105 <SubType>Code</SubType>
101 </Compile> 106 </Compile>
102 <Compile Include="UserProfileData.cs"> 107 <Compile Include="UserProfileData.cs">
103 <SubType>Code</SubType> 108 <SubType>Code</SubType>
104 </Compile> 109 </Compile>
110 <Compile Include="SimProfileData.cs">
111 <SubType>Code</SubType>
112 </Compile>
105 <Compile Include="Properties\AssemblyInfo.cs"> 113 <Compile Include="Properties\AssemblyInfo.cs">
106 <SubType>Code</SubType> 114 <SubType>Code</SubType>
107 </Compile> 115 </Compile>
@@ -113,4 +121,4 @@
113 <PostBuildEvent> 121 <PostBuildEvent>
114 </PostBuildEvent> 122 </PostBuildEvent>
115 </PropertyGroup> 123 </PropertyGroup>
116</Project> 124</Project> \ No newline at end of file
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b..6b489f2 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,14 +11,14 @@
11 <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ReservationData.cs" />
14 <include name="GridData.cs" /> 15 <include name="GridData.cs" />
15 <include name="ILogData.cs" /> 16 <include name="ILogData.cs" />
16 <include name="IniConfig.cs" /> 17 <include name="IniConfig.cs" />
17 <include name="InventoryData.cs" /> 18 <include name="InventoryData.cs" />
18 <include name="ReservationData.cs" />
19 <include name="SimProfileData.cs" />
20 <include name="UserData.cs" /> 19 <include name="UserData.cs" />
21 <include name="UserProfileData.cs" /> 20 <include name="UserProfileData.cs" />
21 <include name="SimProfileData.cs" />
22 <include name="Properties/AssemblyInfo.cs" /> 22 <include name="Properties/AssemblyInfo.cs" />
23 </sources> 23 </sources>
24 <references basedir="${project::get-base-directory()}"> 24 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index 3dddfb4..9db8574 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -26,6 +26,10 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using Nwc.XmlRpc;
30
31using System;
32using System.Collections;
29 33
30namespace OpenSim.Framework.Data 34namespace OpenSim.Framework.Data
31{ 35{
@@ -108,5 +112,71 @@ namespace OpenSim.Framework.Data
108 /// Region Map Texture Asset 112 /// Region Map Texture Asset
109 /// </summary> 113 /// </summary>
110 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006"); 114 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
115
116 /// <summary>
117 /// Get Sim profile data from grid server when in grid mode
118 /// </summary>
119 /// <param name="region_uuid"></param>
120 /// <param name="gridserver_url"></param>
121 /// <param name="?"></param>
122 /// <returns></returns>
123 public SimProfileData RequestSimProfileData(LLUUID region_uuid, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
124 {
125 Hashtable requestData = new Hashtable();
126 requestData["region_uuid"] = region_uuid.UUID.ToString();
127 requestData["authkey"] = gridserver_sendkey;
128 ArrayList SendParams = new ArrayList();
129 SendParams.Add(requestData);
130 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
131 XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
132
133 Hashtable responseData = (Hashtable)GridResp.Value;
134
135 if (responseData.ContainsKey("error"))
136 {
137 return null;
138 }
139
140 SimProfileData simData = new SimProfileData();
141 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
142 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
143 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
144 simData.serverIP = (string)responseData["sim_ip"];
145 simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);
146 simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";
147 simData.UUID = new LLUUID((string)responseData["region_UUID"]);
148 simData.regionName = (string)responseData["region_name"];
149
150 return simData;
151 }
152 public SimProfileData RequestSimProfileData(ulong region_handle, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
153 {
154 Hashtable requestData = new Hashtable();
155 requestData["region_handle"] = region_handle.ToString();
156 requestData["authkey"] = gridserver_sendkey;
157 ArrayList SendParams = new ArrayList();
158 SendParams.Add(requestData);
159 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
160 XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
161
162 Hashtable responseData = (Hashtable)GridResp.Value;
163
164 if (responseData.ContainsKey("error"))
165 {
166 return null;
167 }
168
169 SimProfileData simData = new SimProfileData();
170 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
171 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
172 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
173 simData.serverIP = (string)responseData["sim_ip"];
174 simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);
175 simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";
176 simData.UUID = new LLUUID((string)responseData["region_UUID"]);
177 simData.regionName = (string)responseData["region_name"];
178
179 return simData;
180 }
111 } 181 }
112} 182}
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index a577ea3..4a72db0 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -97,103 +97,100 @@
97 <Compile Include="BlockingQueue.cs"> 97 <Compile Include="BlockingQueue.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="IRegionCommsListener.cs"> 100 <Compile Include="Util.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="LoginService.cs"> 103 <Compile Include="UserProfile.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="RegionCommsListener.cs"> 106 <Compile Include="IRegionCommsListener.cs">
107 <SubType>Code</SubType> 107 <SubType>Code</SubType>
108 </Compile> 108 </Compile>
109 <Compile Include="Remoting.cs"> 109 <Compile Include="Remoting.cs">
110 <SubType>Code</SubType> 110 <SubType>Code</SubType>
111 </Compile> 111 </Compile>
112 <Compile Include="SimProfile.cs"> 112 <Compile Include="RegionCommsListener.cs">
113 <SubType>Code</SubType>
114 </Compile>
115 <Compile Include="UserProfile.cs">
116 <SubType>Code</SubType> 113 <SubType>Code</SubType>
117 </Compile> 114 </Compile>
118 <Compile Include="Util.cs"> 115 <Compile Include="LoginService.cs">
119 <SubType>Code</SubType> 116 <SubType>Code</SubType>
120 </Compile> 117 </Compile>
121 <Compile Include="Interfaces\AuthenticateResponse.cs"> 118 <Compile Include="Interfaces\AuthenticateResponse.cs">
122 <SubType>Code</SubType> 119 <SubType>Code</SubType>
123 </Compile> 120 </Compile>
124 <Compile Include="Interfaces\IAssetServer.cs"> 121 <Compile Include="Interfaces\IUserServer.cs">
125 <SubType>Code</SubType> 122 <SubType>Code</SubType>
126 </Compile> 123 </Compile>
127 <Compile Include="Interfaces\IClientAPI.cs"> 124 <Compile Include="Interfaces\IAssetServer.cs">
128 <SubType>Code</SubType> 125 <SubType>Code</SubType>
129 </Compile> 126 </Compile>
130 <Compile Include="Interfaces\ILocalStorage.cs"> 127 <Compile Include="Interfaces\IWorld.cs">
131 <SubType>Code</SubType> 128 <SubType>Code</SubType>
132 </Compile> 129 </Compile>
133 <Compile Include="Interfaces\IUserServer.cs"> 130 <Compile Include="Interfaces\IClientAPI.cs">
134 <SubType>Code</SubType> 131 <SubType>Code</SubType>
135 </Compile> 132 </Compile>
136 <Compile Include="Interfaces\IWorld.cs"> 133 <Compile Include="Interfaces\ILocalStorage.cs">
137 <SubType>Code</SubType> 134 <SubType>Code</SubType>
138 </Compile> 135 </Compile>
139 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 136 <Compile Include="Interfaces\Config\IGenericConfig.cs">
140 <SubType>Code</SubType> 137 <SubType>Code</SubType>
141 </Compile> 138 </Compile>
142 <Compile Include="Interfaces\Config\IGridConfig.cs"> 139 <Compile Include="Interfaces\Config\IUserConfig.cs">
143 <SubType>Code</SubType> 140 <SubType>Code</SubType>
144 </Compile> 141 </Compile>
145 <Compile Include="Interfaces\Config\IUserConfig.cs"> 142 <Compile Include="Interfaces\Config\IGridConfig.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
148 <Compile Include="Properties\AssemblyInfo.cs"> 145 <Compile Include="Types\MapBlockData.cs">
149 <SubType>Code</SubType> 146 <SubType>Code</SubType>
150 </Compile> 147 </Compile>
151 <Compile Include="Types\AgentCiruitData.cs"> 148 <Compile Include="Types\PrimitiveBaseShape.cs">
152 <SubType>Code</SubType> 149 <SubType>Code</SubType>
153 </Compile> 150 </Compile>
154 <Compile Include="Types\AgentWearable.cs"> 151 <Compile Include="Types\AssetLandmark.cs">
155 <SubType>Code</SubType> 152 <SubType>Code</SubType>
156 </Compile> 153 </Compile>
157 <Compile Include="Types\AssetBase.cs"> 154 <Compile Include="Types\NeighbourInfo.cs">
158 <SubType>Code</SubType> 155 <SubType>Code</SubType>
159 </Compile> 156 </Compile>
160 <Compile Include="Types\AssetLandmark.cs"> 157 <Compile Include="Types\RegionInfo.cs">
161 <SubType>Code</SubType> 158 <SubType>Code</SubType>
162 </Compile> 159 </Compile>
163 <Compile Include="Types\AssetStorage.cs"> 160 <Compile Include="Types\RegionHandle.cs">
164 <SubType>Code</SubType> 161 <SubType>Code</SubType>
165 </Compile> 162 </Compile>
166 <Compile Include="Types\EstateSettings.cs"> 163 <Compile Include="Types\ParcelData.cs">
167 <SubType>Code</SubType> 164 <SubType>Code</SubType>
168 </Compile> 165 </Compile>
169 <Compile Include="Types\Login.cs"> 166 <Compile Include="Types\PrimData.cs">
170 <SubType>Code</SubType> 167 <SubType>Code</SubType>
171 </Compile> 168 </Compile>
172 <Compile Include="Types\MapBlockData.cs"> 169 <Compile Include="Types\AgentWearable.cs">
173 <SubType>Code</SubType> 170 <SubType>Code</SubType>
174 </Compile> 171 </Compile>
175 <Compile Include="Types\NeighbourInfo.cs"> 172 <Compile Include="Types\AssetStorage.cs">
176 <SubType>Code</SubType> 173 <SubType>Code</SubType>
177 </Compile> 174 </Compile>
178 <Compile Include="Types\NetworkServersInfo.cs"> 175 <Compile Include="Types\UUID.cs">
179 <SubType>Code</SubType> 176 <SubType>Code</SubType>
180 </Compile> 177 </Compile>
181 <Compile Include="Types\ParcelData.cs"> 178 <Compile Include="Types\EstateSettings.cs">
182 <SubType>Code</SubType> 179 <SubType>Code</SubType>
183 </Compile> 180 </Compile>
184 <Compile Include="Types\PrimData.cs"> 181 <Compile Include="Types\Login.cs">
185 <SubType>Code</SubType> 182 <SubType>Code</SubType>
186 </Compile> 183 </Compile>
187 <Compile Include="Types\PrimitiveBaseShape.cs"> 184 <Compile Include="Types\AgentCiruitData.cs">
188 <SubType>Code</SubType> 185 <SubType>Code</SubType>
189 </Compile> 186 </Compile>
190 <Compile Include="Types\RegionHandle.cs"> 187 <Compile Include="Types\AssetBase.cs">
191 <SubType>Code</SubType> 188 <SubType>Code</SubType>
192 </Compile> 189 </Compile>
193 <Compile Include="Types\RegionInfo.cs"> 190 <Compile Include="Types\NetworkServersInfo.cs">
194 <SubType>Code</SubType> 191 <SubType>Code</SubType>
195 </Compile> 192 </Compile>
196 <Compile Include="Types\UUID.cs"> 193 <Compile Include="Properties\AssemblyInfo.cs">
197 <SubType>Code</SubType> 194 <SubType>Code</SubType>
198 </Compile> 195 </Compile>
199 </ItemGroup> 196 </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 10fafbf..9fb35bc 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -14,39 +14,38 @@
14 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
15 <include name="AuthenticateSessionBase.cs" /> 15 <include name="AuthenticateSessionBase.cs" />
16 <include name="BlockingQueue.cs" /> 16 <include name="BlockingQueue.cs" />
17 <include name="Util.cs" />
18 <include name="UserProfile.cs" />
17 <include name="IRegionCommsListener.cs" /> 19 <include name="IRegionCommsListener.cs" />
18 <include name="LoginService.cs" />
19 <include name="RegionCommsListener.cs" />
20 <include name="Remoting.cs" /> 20 <include name="Remoting.cs" />
21 <include name="SimProfile.cs" /> 21 <include name="RegionCommsListener.cs" />
22 <include name="UserProfile.cs" /> 22 <include name="LoginService.cs" />
23 <include name="Util.cs" />
24 <include name="Interfaces/AuthenticateResponse.cs" /> 23 <include name="Interfaces/AuthenticateResponse.cs" />
24 <include name="Interfaces/IUserServer.cs" />
25 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
26 <include name="Interfaces/IWorld.cs" />
26 <include name="Interfaces/IClientAPI.cs" /> 27 <include name="Interfaces/IClientAPI.cs" />
27 <include name="Interfaces/ILocalStorage.cs" /> 28 <include name="Interfaces/ILocalStorage.cs" />
28 <include name="Interfaces/IUserServer.cs" />
29 <include name="Interfaces/IWorld.cs" />
30 <include name="Interfaces/Config/IGenericConfig.cs" /> 29 <include name="Interfaces/Config/IGenericConfig.cs" />
31 <include name="Interfaces/Config/IGridConfig.cs" />
32 <include name="Interfaces/Config/IUserConfig.cs" /> 30 <include name="Interfaces/Config/IUserConfig.cs" />
33 <include name="Properties/AssemblyInfo.cs" /> 31 <include name="Interfaces/Config/IGridConfig.cs" />
34 <include name="Types/AgentCiruitData.cs" />
35 <include name="Types/AgentWearable.cs" />
36 <include name="Types/AssetBase.cs" />
37 <include name="Types/AssetLandmark.cs" />
38 <include name="Types/AssetStorage.cs" />
39 <include name="Types/EstateSettings.cs" />
40 <include name="Types/Login.cs" />
41 <include name="Types/MapBlockData.cs" /> 32 <include name="Types/MapBlockData.cs" />
33 <include name="Types/PrimitiveBaseShape.cs" />
34 <include name="Types/AssetLandmark.cs" />
42 <include name="Types/NeighbourInfo.cs" /> 35 <include name="Types/NeighbourInfo.cs" />
43 <include name="Types/NetworkServersInfo.cs" /> 36 <include name="Types/RegionInfo.cs" />
37 <include name="Types/RegionHandle.cs" />
44 <include name="Types/ParcelData.cs" /> 38 <include name="Types/ParcelData.cs" />
45 <include name="Types/PrimData.cs" /> 39 <include name="Types/PrimData.cs" />
46 <include name="Types/PrimitiveBaseShape.cs" /> 40 <include name="Types/AgentWearable.cs" />
47 <include name="Types/RegionHandle.cs" /> 41 <include name="Types/AssetStorage.cs" />
48 <include name="Types/RegionInfo.cs" />
49 <include name="Types/UUID.cs" /> 42 <include name="Types/UUID.cs" />
43 <include name="Types/EstateSettings.cs" />
44 <include name="Types/Login.cs" />
45 <include name="Types/AgentCiruitData.cs" />
46 <include name="Types/AssetBase.cs" />
47 <include name="Types/NetworkServersInfo.cs" />
48 <include name="Properties/AssemblyInfo.cs" />
50 </sources> 49 </sources>
51 <references basedir="${project::get-base-directory()}"> 50 <references basedir="${project::get-base-directory()}">
52 <lib> 51 <lib>
diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
deleted file mode 100644
index 47f1af3..0000000
--- a/OpenSim/Framework/General/SimProfile.cs
+++ /dev/null
@@ -1,119 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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
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
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using libsecondlife;
31using Nwc.XmlRpc;
32
33namespace OpenSim.Framework.Sims
34{
35 public class SimProfile
36 {
37 public LLUUID UUID;
38 public ulong regionhandle;
39 public string regionname;
40 public string sim_ip;
41 public uint sim_port;
42 public string caps_url;
43 public uint RegionLocX;
44 public uint RegionLocY;
45 public string sendkey;
46 public string recvkey;
47 public bool online;
48
49 public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)
50 {
51 try
52 {
53 Hashtable GridReqParams = new Hashtable();
54 GridReqParams["region_handle"] = region_handle.ToString();
55 GridReqParams["authkey"] = SendKey;
56 ArrayList SendParams = new ArrayList();
57 SendParams.Add(GridReqParams);
58 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
59
60 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
61
62 Hashtable RespData = (Hashtable)GridResp.Value;
63 this.UUID = new LLUUID((string)RespData["UUID"]);
64 this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
65 this.regionname = (string)RespData["regionname"];
66 this.sim_ip = (string)RespData["sim_ip"];
67 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
68 this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
69 this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
70 this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
71 this.sendkey = SendKey;
72 this.recvkey = RecvKey;
73 }
74 catch (Exception e)
75 {
76 System.Console.WriteLine(e.ToString());
77 }
78 return this;
79 }
80
81 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
82 {
83 try
84 {
85 Hashtable GridReqParams = new Hashtable();
86 GridReqParams["UUID"] = UUID.ToString();
87 GridReqParams["authkey"] = SendKey;
88 ArrayList SendParams = new ArrayList();
89 SendParams.Add(GridReqParams);
90 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
91
92 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
93
94 Hashtable RespData = (Hashtable)GridResp.Value;
95 this.UUID = new LLUUID((string)RespData["UUID"]);
96 this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
97 this.regionname = (string)RespData["regionname"];
98 this.sim_ip = (string)RespData["sim_ip"];
99 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
100 this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
101 this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
102 this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
103 this.sendkey = SendKey;
104 this.recvkey = RecvKey;
105 }
106 catch (Exception e)
107 {
108 System.Console.WriteLine(e.ToString());
109 }
110 return this;
111 }
112
113
114 public SimProfile()
115 {
116 }
117 }
118
119}
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index f316cc7..af5feac 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -357,6 +357,8 @@ namespace OpenSim.Framework.UserManagement
357 /// <returns>The response to send</returns> 357 /// <returns>The response to send</returns>
358 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) 358 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
359 { 359 {
360
361 System.Console.WriteLine("Attempting login now...");
360 XmlRpcResponse response = new XmlRpcResponse(); 362 XmlRpcResponse response = new XmlRpcResponse();
361 Hashtable requestData = (Hashtable)request.Params[0]; 363 Hashtable requestData = (Hashtable)request.Params[0];
362 364
@@ -457,11 +459,13 @@ namespace OpenSim.Framework.UserManagement
457 { 459 {
458 System.Console.WriteLine(e.ToString()); 460 System.Console.WriteLine(e.ToString());
459 return logResponse.CreateDeadRegionResponse(); 461 return logResponse.CreateDeadRegionResponse();
462 //return logResponse.ToXmlRpcResponse();
460 } 463 }
461 CommitAgent(ref userProfile); 464 CommitAgent(ref userProfile);
462 return logResponse.ToXmlRpcResponse(); 465 return logResponse.ToXmlRpcResponse();
463 466
464 } 467 }
468
465 catch (Exception E) 469 catch (Exception E)
466 { 470 {
467 System.Console.WriteLine(E.ToString()); 471 System.Console.WriteLine(E.ToString());
generated by cgit v1.1 at 2024-12-26 06:05:26 +0000