diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/AgentInventory.cs (renamed from Common/OpenSim.Framework/AgentInventory.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/AuthenticateSessionBase.cs (renamed from Common/OpenSim.Framework/AuthenticateSessionBase.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/BlockingQueue.cs (renamed from Common/OpenSim.Framework/BlockingQueue.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/IRegionCommsListener.cs (renamed from Common/OpenSim.Framework/IRegionCommsListener.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs (renamed from Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs (renamed from Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs (renamed from Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs (renamed from Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IAssetServer.cs (renamed from Common/OpenSim.Framework/Interfaces/IAssetServer.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs (renamed from Common/OpenSim.Framework/Interfaces/IClientAPI.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/ILocalStorage.cs (renamed from Common/OpenSim.Framework/Interfaces/ILocalStorage.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IUserServer.cs (renamed from Common/OpenSim.Framework/Interfaces/IUserServer.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IWorld.cs (renamed from Common/OpenSim.Framework/Interfaces/IWorld.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Logger.cs (renamed from Common/OpenSim.Framework/Logger.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/LoginService.cs (renamed from Common/OpenSim.Framework/LoginService.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/OpenSim.Framework.csproj (renamed from Common/OpenSim.Framework/OpenSim.Framework.csproj) | 64 | ||||
-rw-r--r-- | OpenSim/Framework/General/OpenSim.Framework.dll.build (renamed from Common/OpenSim.Framework/OpenSim.Framework.dll.build) | 19 | ||||
-rw-r--r-- | OpenSim/Framework/General/Properties/AssemblyInfo.cs (renamed from Common/OpenSim.Framework/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/RegionCommsListener.cs (renamed from Common/OpenSim.Framework/RegionCommsListener.cs) | 1 | ||||
-rw-r--r-- | OpenSim/Framework/General/Remoting.cs (renamed from Common/OpenSim.Framework/Remoting.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/SimProfile.cs (renamed from Common/OpenSim.Framework/SimProfile.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AgentCiruitData.cs (renamed from Common/OpenSim.Framework/Types/AgentCiruitData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AgentWearable.cs (renamed from Common/OpenSim.Framework/Types/AgentWearable.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetBase.cs (renamed from Common/OpenSim.Framework/Types/AssetBase.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetLandmark.cs (renamed from Common/OpenSim.Framework/Types/AssetLandmark.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/AssetStorage.cs (renamed from Common/OpenSim.Framework/Types/AssetStorage.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/EstateSettings.cs (renamed from Common/OpenSim.Framework/Types/EstateSettings.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/Login.cs (renamed from Common/OpenSim.Framework/Types/Login.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/MapBlockData.cs (renamed from Common/OpenSim.Framework/Types/MapBlockData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/NeighbourInfo.cs (renamed from Common/OpenSim.Framework/Types/NeighbourInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/NetworkServersInfo.cs (renamed from Common/OpenSim.Framework/Types/NetworkServersInfo.cs) | 39 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/ParcelData.cs (renamed from Common/OpenSim.Framework/Types/ParcelData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/PrimData.cs (renamed from Common/OpenSim.Framework/Types/PrimData.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/RegionHandle.cs (renamed from Common/OpenSim.Framework/Types/RegionHandle.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs (renamed from Common/OpenSim.Framework/Types/RegionInfo.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Framework/General/UserProfile.cs (renamed from Common/OpenSim.Framework/UserProfile.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Framework/General/Util.cs (renamed from Common/OpenSim.Framework/Util.cs) | 0 |
37 files changed, 77 insertions, 56 deletions
diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs index fbf4d23..fbf4d23 100644 --- a/Common/OpenSim.Framework/AgentInventory.cs +++ b/OpenSim/Framework/General/AgentInventory.cs | |||
diff --git a/Common/OpenSim.Framework/AuthenticateSessionBase.cs b/OpenSim/Framework/General/AuthenticateSessionBase.cs index 73dd3e2..73dd3e2 100644 --- a/Common/OpenSim.Framework/AuthenticateSessionBase.cs +++ b/OpenSim/Framework/General/AuthenticateSessionBase.cs | |||
diff --git a/Common/OpenSim.Framework/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs index 667b8d8..667b8d8 100644 --- a/Common/OpenSim.Framework/BlockingQueue.cs +++ b/OpenSim/Framework/General/BlockingQueue.cs | |||
diff --git a/Common/OpenSim.Framework/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs index 0e80941..0e80941 100644 --- a/Common/OpenSim.Framework/IRegionCommsListener.cs +++ b/OpenSim/Framework/General/IRegionCommsListener.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs index 462e2c5..462e2c5 100644 --- a/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs +++ b/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs index 13980fe..13980fe 100644 --- a/Common/OpenSim.Framework/Interfaces/Config/IGenericConfig.cs +++ b/OpenSim/Framework/General/Interfaces/Config/IGenericConfig.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs index 0fafe1a..0fafe1a 100644 --- a/Common/OpenSim.Framework/Interfaces/Config/IGridConfig.cs +++ b/OpenSim/Framework/General/Interfaces/Config/IGridConfig.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs index 2f4b340..2f4b340 100644 --- a/Common/OpenSim.Framework/Interfaces/Config/IUserConfig.cs +++ b/OpenSim/Framework/General/Interfaces/Config/IUserConfig.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/Interfaces/IAssetServer.cs index 826392d..826392d 100644 --- a/Common/OpenSim.Framework/Interfaces/IAssetServer.cs +++ b/OpenSim/Framework/General/Interfaces/IAssetServer.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 009648c..4e8ac1a 100644 --- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -69,6 +69,8 @@ namespace OpenSim.Framework.Interfaces | |||
69 | 69 | ||
70 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); | 70 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); |
71 | 71 | ||
72 | public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); | ||
73 | |||
72 | public interface IClientAPI | 74 | public interface IClientAPI |
73 | { | 75 | { |
74 | event ChatFromViewer OnChatFromViewer; | 76 | event ChatFromViewer OnChatFromViewer; |
@@ -103,6 +105,8 @@ namespace OpenSim.Framework.Interfaces | |||
103 | event NewAvatar OnNewAvatar; | 105 | event NewAvatar OnNewAvatar; |
104 | event GenericCall6 OnRemoveAvatar; | 106 | event GenericCall6 OnRemoveAvatar; |
105 | 107 | ||
108 | event UUIDNameRequest OnNameFromUUIDRequest; | ||
109 | |||
106 | event ParcelPropertiesRequest OnParcelPropertiesRequest; | 110 | event ParcelPropertiesRequest OnParcelPropertiesRequest; |
107 | event ParcelDivideRequest OnParcelDivideRequest; | 111 | event ParcelDivideRequest OnParcelDivideRequest; |
108 | event ParcelJoinRequest OnParcelJoinRequest; | 112 | event ParcelJoinRequest OnParcelJoinRequest; |
diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs index 4987d10..4987d10 100644 --- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs +++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/IUserServer.cs b/OpenSim/Framework/General/Interfaces/IUserServer.cs index c6e2223..c6e2223 100644 --- a/Common/OpenSim.Framework/Interfaces/IUserServer.cs +++ b/OpenSim/Framework/General/Interfaces/IUserServer.cs | |||
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/OpenSim/Framework/General/Interfaces/IWorld.cs index 4857417..4857417 100644 --- a/Common/OpenSim.Framework/Interfaces/IWorld.cs +++ b/OpenSim/Framework/General/Interfaces/IWorld.cs | |||
diff --git a/Common/OpenSim.Framework/Logger.cs b/OpenSim/Framework/General/Logger.cs index e7eaa03..e7eaa03 100644 --- a/Common/OpenSim.Framework/Logger.cs +++ b/OpenSim/Framework/General/Logger.cs | |||
diff --git a/Common/OpenSim.Framework/LoginService.cs b/OpenSim/Framework/General/LoginService.cs index f14754f..f14754f 100644 --- a/Common/OpenSim.Framework/LoginService.cs +++ b/OpenSim/Framework/General/LoginService.cs | |||
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index 7ebe0ee..48db634 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.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,8 +6,7 @@ | |||
6 | <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{8ACA2445-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> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim.Framework</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Framework</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,18 +28,16 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
39 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>..\..\..\bin\</OutputPath> |
40 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,49 +46,45 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
59 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>..\..\..\bin\</OutputPath> |
60 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="Db4objects.Db4o.dll"> | 61 | <Reference Include="Db4objects.Db4o.dll" > |
69 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 62 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="libsecondlife.dll"> | 65 | <Reference Include="libsecondlife.dll" > |
73 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 66 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System"> | 69 | <Reference Include="System" > |
77 | <HintPath>System.dll</HintPath> | 70 | <HintPath>System.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="System.Xml"> | 73 | <Reference Include="System.Xml" > |
81 | <HintPath>System.Xml.dll</HintPath> | 74 | <HintPath>System.Xml.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
77 | <Reference Include="XMLRPC.dll" > | ||
78 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
84 | </ItemGroup> | 81 | </ItemGroup> |
85 | <ItemGroup> | 82 | <ItemGroup> |
86 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 83 | <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> |
87 | <Name>OpenSim.Framework.Console</Name> | 84 | <Name>OpenSim.Framework.Console</Name> |
88 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 85 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
89 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
90 | <Private>False</Private> | 87 | <Private>False</Private> |
91 | </ProjectReference> | ||
92 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
93 | <Name>XMLRPC</Name> | ||
94 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
95 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
96 | <Private>False</Private> | ||
97 | </ProjectReference> | 88 | </ProjectReference> |
98 | </ItemGroup> | 89 | </ItemGroup> |
99 | <ItemGroup> | 90 | <ItemGroup> |
@@ -109,9 +100,6 @@ | |||
109 | <Compile Include="IRegionCommsListener.cs"> | 100 | <Compile Include="IRegionCommsListener.cs"> |
110 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
111 | </Compile> | 102 | </Compile> |
112 | <Compile Include="LLSDHelpers.cs"> | ||
113 | <SubType>Code</SubType> | ||
114 | </Compile> | ||
115 | <Compile Include="Logger.cs"> | 103 | <Compile Include="Logger.cs"> |
116 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
117 | </Compile> | 105 | </Compile> |
@@ -160,12 +148,6 @@ | |||
160 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 148 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
161 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
162 | </Compile> | 150 | </Compile> |
163 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> | ||
164 | <SubType>Code</SubType> | ||
165 | </Compile> | ||
166 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> | ||
167 | <SubType>Code</SubType> | ||
168 | </Compile> | ||
169 | <Compile Include="Properties\AssemblyInfo.cs"> | 151 | <Compile Include="Properties\AssemblyInfo.cs"> |
170 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
171 | </Compile> | 153 | </Compile> |
@@ -219,4 +201,4 @@ | |||
219 | <PostBuildEvent> | 201 | <PostBuildEvent> |
220 | </PostBuildEvent> | 202 | </PostBuildEvent> |
221 | </PropertyGroup> | 203 | </PropertyGroup> |
222 | </Project> \ No newline at end of file | 204 | </Project> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build index afe1aea..a18838b 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build | |||
@@ -15,15 +15,12 @@ | |||
15 | <include name="AuthenticateSessionBase.cs" /> | 15 | <include name="AuthenticateSessionBase.cs" /> |
16 | <include name="BlockingQueue.cs" /> | 16 | <include name="BlockingQueue.cs" /> |
17 | <include name="IRegionCommsListener.cs" /> | 17 | <include name="IRegionCommsListener.cs" /> |
18 | <include name="LLSDHelpers.cs" /> | ||
19 | <include name="Logger.cs" /> | 18 | <include name="Logger.cs" /> |
20 | <include name="LoginService.cs" /> | 19 | <include name="LoginService.cs" /> |
21 | <include name="RegionCommsListener.cs" /> | 20 | <include name="RegionCommsListener.cs" /> |
22 | <include name="Remoting.cs" /> | 21 | <include name="Remoting.cs" /> |
23 | <include name="SimProfile.cs" /> | 22 | <include name="SimProfile.cs" /> |
24 | <include name="UserProfile.cs" /> | 23 | <include name="UserProfile.cs" /> |
25 | <include name="UserProfileManager.cs" /> | ||
26 | <include name="UserProfileManagerBase.cs" /> | ||
27 | <include name="Util.cs" /> | 24 | <include name="Util.cs" /> |
28 | <include name="Interfaces/AuthenticateResponse.cs" /> | 25 | <include name="Interfaces/AuthenticateResponse.cs" /> |
29 | <include name="Interfaces/IAssetServer.cs" /> | 26 | <include name="Interfaces/IAssetServer.cs" /> |
@@ -34,8 +31,6 @@ | |||
34 | <include name="Interfaces/Config/IGenericConfig.cs" /> | 31 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
35 | <include name="Interfaces/Config/IGridConfig.cs" /> | 32 | <include name="Interfaces/Config/IGridConfig.cs" /> |
36 | <include name="Interfaces/Config/IUserConfig.cs" /> | 33 | <include name="Interfaces/Config/IUserConfig.cs" /> |
37 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> | ||
38 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> | ||
39 | <include name="Properties/AssemblyInfo.cs" /> | 34 | <include name="Properties/AssemblyInfo.cs" /> |
40 | <include name="Types/AgentCiruitData.cs" /> | 35 | <include name="Types/AgentCiruitData.cs" /> |
41 | <include name="Types/AgentWearable.cs" /> | 36 | <include name="Types/AgentWearable.cs" /> |
@@ -57,17 +52,17 @@ | |||
57 | <include name="${project::get-base-directory()}" /> | 52 | <include name="${project::get-base-directory()}" /> |
58 | <include name="${project::get-base-directory()}/${build.dir}" /> | 53 | <include name="${project::get-base-directory()}/${build.dir}" /> |
59 | </lib> | 54 | </lib> |
60 | <include name="../../bin/Db4objects.Db4o.dll" /> | 55 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
61 | <include name="../../bin/libsecondlife.dll" /> | 56 | <include name="../../../bin/libsecondlife.dll" /> |
62 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 57 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
63 | <include name="System.dll" /> | 58 | <include name="System.dll" /> |
64 | <include name="System.Xml.dll" /> | 59 | <include name="System.Xml.dll" /> |
65 | <include name="../../bin/XMLRPC.dll" /> | 60 | <include name="../../../bin/XMLRPC.dll" /> |
66 | </references> | 61 | </references> |
67 | </csc> | 62 | </csc> |
68 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 63 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> |
69 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 64 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> |
70 | <copy todir="${project::get-base-directory()}/../../bin/"> | 65 | <copy todir="${project::get-base-directory()}/../../../bin/"> |
71 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 66 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
72 | <include name="*.dll"/> | 67 | <include name="*.dll"/> |
73 | <include name="*.exe"/> | 68 | <include name="*.exe"/> |
diff --git a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs index 86f5cdb..86f5cdb 100644 --- a/Common/OpenSim.Framework/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/General/Properties/AssemblyInfo.cs | |||
diff --git a/Common/OpenSim.Framework/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs index bba928f..5fa2f58 100644 --- a/Common/OpenSim.Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/General/RegionCommsListener.cs | |||
@@ -49,6 +49,7 @@ namespace OpenSim.Framework | |||
49 | { | 49 | { |
50 | if(OnExpectUser != null) | 50 | if(OnExpectUser != null) |
51 | { | 51 | { |
52 | |||
52 | OnExpectUser(regionHandle, agent); | 53 | OnExpectUser(regionHandle, agent); |
53 | return true; | 54 | return true; |
54 | } | 55 | } |
diff --git a/Common/OpenSim.Framework/Remoting.cs b/OpenSim/Framework/General/Remoting.cs index e6fdf70..e6fdf70 100644 --- a/Common/OpenSim.Framework/Remoting.cs +++ b/OpenSim/Framework/General/Remoting.cs | |||
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs index cfa5e50..cfa5e50 100644 --- a/Common/OpenSim.Framework/SimProfile.cs +++ b/OpenSim/Framework/General/SimProfile.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs index a650343..a650343 100644 --- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs +++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs index 4c93da7..4c93da7 100644 --- a/Common/OpenSim.Framework/Types/AgentWearable.cs +++ b/OpenSim/Framework/General/Types/AgentWearable.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs index 86586a6..86586a6 100644 --- a/Common/OpenSim.Framework/Types/AssetBase.cs +++ b/OpenSim/Framework/General/Types/AssetBase.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs index 8a10b70..8a10b70 100644 --- a/Common/OpenSim.Framework/Types/AssetLandmark.cs +++ b/OpenSim/Framework/General/Types/AssetLandmark.cs | |||
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs index 8cac23a..8cac23a 100644 --- a/Common/OpenSim.Framework/Types/AssetStorage.cs +++ b/OpenSim/Framework/General/Types/AssetStorage.cs | |||
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs index 778c893..778c893 100644 --- a/Common/OpenSim.Framework/Types/EstateSettings.cs +++ b/OpenSim/Framework/General/Types/EstateSettings.cs | |||
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs index 3180a16..3180a16 100644 --- a/Common/OpenSim.Framework/Types/Login.cs +++ b/OpenSim/Framework/General/Types/Login.cs | |||
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs index 2e6f56e..2e6f56e 100644 --- a/Common/OpenSim.Framework/Types/MapBlockData.cs +++ b/OpenSim/Framework/General/Types/MapBlockData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs index 310fd1c..310fd1c 100644 --- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs +++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs | |||
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index 73d7811..c6b81a7 100644 --- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types | |||
156 | this.GridRecvKey = attri; | 156 | this.GridRecvKey = attri; |
157 | } | 157 | } |
158 | 158 | ||
159 | //Grid Server | ||
160 | attri = ""; | ||
161 | attri = configData.GetAttribute("UserServerURL"); | ||
162 | if (attri == "") | ||
163 | { | ||
164 | this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/"); | ||
165 | configData.SetAttribute("UserServerURL", this.UserURL); | ||
166 | } | ||
167 | else | ||
168 | { | ||
169 | this.UserURL = attri; | ||
170 | } | ||
171 | |||
172 | //Grid Send Key | ||
173 | attri = ""; | ||
174 | attri = configData.GetAttribute("UserSendKey"); | ||
175 | if (attri == "") | ||
176 | { | ||
177 | this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null"); | ||
178 | configData.SetAttribute("UserSendKey", this.UserSendKey); | ||
179 | } | ||
180 | else | ||
181 | { | ||
182 | this.UserSendKey = attri; | ||
183 | } | ||
184 | |||
185 | //Grid Receive Key | ||
186 | attri = ""; | ||
187 | attri = configData.GetAttribute("UserRecvKey"); | ||
188 | if (attri == "") | ||
189 | { | ||
190 | this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null"); | ||
191 | configData.SetAttribute("GridRecvKey", this.UserRecvKey); | ||
192 | } | ||
193 | else | ||
194 | { | ||
195 | this.UserRecvKey = attri; | ||
196 | } | ||
197 | |||
159 | attri = ""; | 198 | attri = ""; |
160 | attri = configData.GetAttribute("AssetServerURL"); | 199 | attri = configData.GetAttribute("AssetServerURL"); |
161 | if (attri == "") | 200 | if (attri == "") |
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs index 40f128a..40f128a 100644 --- a/Common/OpenSim.Framework/Types/ParcelData.cs +++ b/OpenSim/Framework/General/Types/ParcelData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs index f84ae3e..f84ae3e 100644 --- a/Common/OpenSim.Framework/Types/PrimData.cs +++ b/OpenSim/Framework/General/Types/PrimData.cs | |||
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs index 1271d04..1271d04 100644 --- a/Common/OpenSim.Framework/Types/RegionHandle.cs +++ b/OpenSim/Framework/General/Types/RegionHandle.cs | |||
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 48e6922..0fba6ca 100644 --- a/Common/OpenSim.Framework/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types | |||
110 | attri = configData.GetAttribute("SimLocationX"); | 110 | attri = configData.GetAttribute("SimLocationX"); |
111 | if (attri == "") | 111 | if (attri == "") |
112 | { | 112 | { |
113 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997"); | 113 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000"); |
114 | configData.SetAttribute("SimLocationX", location); | 114 | configData.SetAttribute("SimLocationX", location); |
115 | this.RegionLocX = (uint)Convert.ToUInt32(location); | 115 | this.RegionLocX = (uint)Convert.ToUInt32(location); |
116 | } | 116 | } |
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types | |||
123 | attri = configData.GetAttribute("SimLocationY"); | 123 | attri = configData.GetAttribute("SimLocationY"); |
124 | if (attri == "") | 124 | if (attri == "") |
125 | { | 125 | { |
126 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996"); | 126 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); |
127 | configData.SetAttribute("SimLocationY", location); | 127 | configData.SetAttribute("SimLocationY", location); |
128 | this.RegionLocY = (uint)Convert.ToUInt32(location); | 128 | this.RegionLocY = (uint)Convert.ToUInt32(location); |
129 | } | 129 | } |
diff --git a/Common/OpenSim.Framework/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs index 04ff20b..263dba2 100644 --- a/Common/OpenSim.Framework/UserProfile.cs +++ b/OpenSim/Framework/General/UserProfile.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User | |||
59 | { | 59 | { |
60 | Circuits = new Dictionary<LLUUID, uint>(); | 60 | Circuits = new Dictionary<LLUUID, uint>(); |
61 | Inventory = new AgentInventory(); | 61 | Inventory = new AgentInventory(); |
62 | homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); | 62 | homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256)); |
63 | homepos = new LLVector3(); | 63 | homepos = new LLVector3(); |
64 | homelookat = new LLVector3(); | 64 | homelookat = new LLVector3(); |
65 | } | 65 | } |
diff --git a/Common/OpenSim.Framework/Util.cs b/OpenSim/Framework/General/Util.cs index 8c34c9b..8c34c9b 100644 --- a/Common/OpenSim.Framework/Util.cs +++ b/OpenSim/Framework/General/Util.cs | |||