diff options
author | mingchen | 2007-06-29 16:43:48 +0000 |
---|---|---|
committer | mingchen | 2007-06-29 16:43:48 +0000 |
commit | 6b3777d3db323f2054aeff1ba4be3e78edef21b8 (patch) | |
tree | 0b1f014042ba261a986b359dc24ecfed4c4e42ea /OpenSim/Framework | |
parent | * just making sure build files are latest (diff) | |
download | opensim-SC_OLD-6b3777d3db323f2054aeff1ba4be3e78edef21b8.zip opensim-SC_OLD-6b3777d3db323f2054aeff1ba4be3e78edef21b8.tar.gz opensim-SC_OLD-6b3777d3db323f2054aeff1ba4be3e78edef21b8.tar.bz2 opensim-SC_OLD-6b3777d3db323f2054aeff1ba4be3e78edef21b8.tar.xz |
*Deleted Logger.cs from OpenSim.Framework
Diffstat (limited to 'OpenSim/Framework')
19 files changed, 87 insertions, 176 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..f6e8311 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="DB4oManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="DB4oUserData.cs"> | 97 | <Compile Include="DB4oGridData.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..2c5e31b 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="DB4oGridData.cs" /> | ||
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oUserData.cs" /> | 14 | <include name="DB4oUserData.cs" /> |
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oGridData.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..47b9ba3 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj | |||
@@ -78,22 +78,22 @@ | |||
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | </ItemGroup> | 79 | </ItemGroup> |
80 | <ItemGroup> | 80 | <ItemGroup> |
81 | <Compile Include="GridData.cs"> | 81 | <Compile Include="ReservationData.cs"> |
82 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
83 | </Compile> | 83 | </Compile> |
84 | <Compile Include="ILogData.cs"> | 84 | <Compile Include="GridData.cs"> |
85 | <SubType>Code</SubType> | 85 | <SubType>Code</SubType> |
86 | </Compile> | 86 | </Compile> |
87 | <Compile Include="IniConfig.cs"> | 87 | <Compile Include="SimProfileData.cs"> |
88 | <SubType>Code</SubType> | 88 | <SubType>Code</SubType> |
89 | </Compile> | 89 | </Compile> |
90 | <Compile Include="InventoryData.cs"> | 90 | <Compile Include="ILogData.cs"> |
91 | <SubType>Code</SubType> | 91 | <SubType>Code</SubType> |
92 | </Compile> | 92 | </Compile> |
93 | <Compile Include="ReservationData.cs"> | 93 | <Compile Include="IniConfig.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="SimProfileData.cs"> | 96 | <Compile Include="InventoryData.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="UserData.cs"> | 99 | <Compile Include="UserData.cs"> |
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build index aefb02b..881bb3a 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build | |||
@@ -11,12 +11,12 @@ | |||
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" /> |
16 | <include name="SimProfileData.cs" /> | ||
15 | <include name="ILogData.cs" /> | 17 | <include name="ILogData.cs" /> |
16 | <include name="IniConfig.cs" /> | 18 | <include name="IniConfig.cs" /> |
17 | <include name="InventoryData.cs" /> | 19 | <include name="InventoryData.cs" /> |
18 | <include name="ReservationData.cs" /> | ||
19 | <include name="SimProfileData.cs" /> | ||
20 | <include name="UserData.cs" /> | 20 | <include name="UserData.cs" /> |
21 | <include name="UserProfileData.cs" /> | 21 | <include name="UserProfileData.cs" /> |
22 | <include name="Properties/AssemblyInfo.cs" /> | 22 | <include name="Properties/AssemblyInfo.cs" /> |
diff --git a/OpenSim/Framework/General/Logger.cs b/OpenSim/Framework/General/Logger.cs deleted file mode 100644 index e7eaa03..0000000 --- a/OpenSim/Framework/General/Logger.cs +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.Framework | ||
6 | { | ||
7 | public class Logger | ||
8 | { | ||
9 | public static Logger Instance = new Logger( false ); | ||
10 | |||
11 | public delegate void LoggerMethodDelegate(); | ||
12 | private delegate bool LoggerDelegate( LoggerMethodDelegate whatToDo ); | ||
13 | |||
14 | |||
15 | private LoggerDelegate m_delegate; | ||
16 | |||
17 | public Logger( bool log ) | ||
18 | { | ||
19 | if( log ) | ||
20 | { | ||
21 | m_delegate = CatchAndLog; | ||
22 | } | ||
23 | else | ||
24 | { | ||
25 | m_delegate = DontCatch; | ||
26 | } | ||
27 | } | ||
28 | |||
29 | public bool Wrap( LoggerMethodDelegate whatToDo ) | ||
30 | { | ||
31 | return m_delegate( whatToDo ); | ||
32 | } | ||
33 | |||
34 | |||
35 | private bool CatchAndLog(LoggerMethodDelegate whatToDo) | ||
36 | { | ||
37 | try | ||
38 | { | ||
39 | whatToDo(); | ||
40 | return true; | ||
41 | } | ||
42 | catch(Exception e) | ||
43 | { | ||
44 | System.Console.WriteLine( "Exception logged!!! Woah!!!!" ); | ||
45 | return false; | ||
46 | } | ||
47 | } | ||
48 | |||
49 | private bool DontCatch(LoggerMethodDelegate whatToDo) | ||
50 | { | ||
51 | whatToDo(); | ||
52 | return true; | ||
53 | } | ||
54 | |||
55 | public class LoggerExample | ||
56 | { | ||
57 | public void TryWrap() | ||
58 | { | ||
59 | // This will log and ignore | ||
60 | Logger log = new Logger(true); | ||
61 | |||
62 | log.Wrap(delegate() | ||
63 | { | ||
64 | Int16.Parse("waa!"); | ||
65 | }); | ||
66 | |||
67 | // This will throw; | ||
68 | try | ||
69 | { | ||
70 | |||
71 | log = new Logger(false); | ||
72 | |||
73 | log.Wrap(delegate() | ||
74 | { | ||
75 | Int16.Parse("waa!"); | ||
76 | }); | ||
77 | } | ||
78 | catch | ||
79 | { | ||
80 | System.Console.WriteLine("Example barfed!"); | ||
81 | } | ||
82 | } | ||
83 | } | ||
84 | } | ||
85 | } | ||
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index 48db634..c12d436 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.csproj | |||
@@ -88,109 +88,106 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="AgentInventory.cs"> | ||
92 | <SubType>Code</SubType> | ||
93 | </Compile> | ||
94 | <Compile Include="AuthenticateSessionBase.cs"> | 91 | <Compile Include="AuthenticateSessionBase.cs"> |
95 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
96 | </Compile> | 93 | </Compile> |
97 | <Compile Include="BlockingQueue.cs"> | 94 | <Compile Include="Remoting.cs"> |
98 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
99 | </Compile> | 96 | </Compile> |
100 | <Compile Include="IRegionCommsListener.cs"> | 97 | <Compile Include="RegionCommsListener.cs"> |
101 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
102 | </Compile> | 99 | </Compile> |
103 | <Compile Include="Logger.cs"> | 100 | <Compile Include="BlockingQueue.cs"> |
104 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
105 | </Compile> | 102 | </Compile> |
106 | <Compile Include="LoginService.cs"> | 103 | <Compile Include="IRegionCommsListener.cs"> |
107 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
108 | </Compile> | 105 | </Compile> |
109 | <Compile Include="RegionCommsListener.cs"> | 106 | <Compile Include="Util.cs"> |
110 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
111 | </Compile> | 108 | </Compile> |
112 | <Compile Include="Remoting.cs"> | 109 | <Compile Include="UserProfile.cs"> |
113 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
114 | </Compile> | 111 | </Compile> |
115 | <Compile Include="SimProfile.cs"> | 112 | <Compile Include="SimProfile.cs"> |
116 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
117 | </Compile> | 114 | </Compile> |
118 | <Compile Include="UserProfile.cs"> | 115 | <Compile Include="LoginService.cs"> |
119 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
120 | </Compile> | 117 | </Compile> |
121 | <Compile Include="Util.cs"> | 118 | <Compile Include="AgentInventory.cs"> |
122 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
123 | </Compile> | 120 | </Compile> |
124 | <Compile Include="Interfaces\AuthenticateResponse.cs"> | 121 | <Compile Include="Interfaces\AuthenticateResponse.cs"> |
125 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
126 | </Compile> | 123 | </Compile> |
127 | <Compile Include="Interfaces\IAssetServer.cs"> | 124 | <Compile Include="Interfaces\IUserServer.cs"> |
128 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
129 | </Compile> | 126 | </Compile> |
130 | <Compile Include="Interfaces\IClientAPI.cs"> | 127 | <Compile Include="Interfaces\IAssetServer.cs"> |
131 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
132 | </Compile> | 129 | </Compile> |
133 | <Compile Include="Interfaces\ILocalStorage.cs"> | 130 | <Compile Include="Interfaces\IWorld.cs"> |
134 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
135 | </Compile> | 132 | </Compile> |
136 | <Compile Include="Interfaces\IUserServer.cs"> | 133 | <Compile Include="Interfaces\IClientAPI.cs"> |
137 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
138 | </Compile> | 135 | </Compile> |
139 | <Compile Include="Interfaces\IWorld.cs"> | 136 | <Compile Include="Interfaces\ILocalStorage.cs"> |
140 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
141 | </Compile> | 138 | </Compile> |
142 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 139 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
143 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
144 | </Compile> | 141 | </Compile> |
145 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 142 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
146 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
147 | </Compile> | 144 | </Compile> |
148 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 145 | <Compile Include="Interfaces\Config\IGridConfig.cs"> |
149 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
150 | </Compile> | 147 | </Compile> |
151 | <Compile Include="Properties\AssemblyInfo.cs"> | 148 | <Compile Include="Properties\AssemblyInfo.cs"> |
152 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
153 | </Compile> | 150 | </Compile> |
154 | <Compile Include="Types\AgentCiruitData.cs"> | 151 | <Compile Include="Types\NeighbourInfo.cs"> |
155 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
156 | </Compile> | 153 | </Compile> |
157 | <Compile Include="Types\AgentWearable.cs"> | 154 | <Compile Include="Types\NetworkServersInfo.cs"> |
158 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
159 | </Compile> | 156 | </Compile> |
160 | <Compile Include="Types\AssetBase.cs"> | 157 | <Compile Include="Types\RegionHandle.cs"> |
161 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
162 | </Compile> | 159 | </Compile> |
163 | <Compile Include="Types\AssetLandmark.cs"> | 160 | <Compile Include="Types\RegionInfo.cs"> |
164 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
165 | </Compile> | 162 | </Compile> |
166 | <Compile Include="Types\AssetStorage.cs"> | 163 | <Compile Include="Types\ParcelData.cs"> |
167 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
168 | </Compile> | 165 | </Compile> |
169 | <Compile Include="Types\EstateSettings.cs"> | 166 | <Compile Include="Types\AgentWearable.cs"> |
170 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
171 | </Compile> | 168 | </Compile> |
172 | <Compile Include="Types\Login.cs"> | 169 | <Compile Include="Types\PrimData.cs"> |
173 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
174 | </Compile> | 171 | </Compile> |
175 | <Compile Include="Types\MapBlockData.cs"> | 172 | <Compile Include="Types\MapBlockData.cs"> |
176 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
177 | </Compile> | 174 | </Compile> |
178 | <Compile Include="Types\NeighbourInfo.cs"> | 175 | <Compile Include="Types\AssetStorage.cs"> |
179 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
180 | </Compile> | 177 | </Compile> |
181 | <Compile Include="Types\NetworkServersInfo.cs"> | 178 | <Compile Include="Types\EstateSettings.cs"> |
182 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
183 | </Compile> | 180 | </Compile> |
184 | <Compile Include="Types\ParcelData.cs"> | 181 | <Compile Include="Types\AgentCiruitData.cs"> |
185 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
186 | </Compile> | 183 | </Compile> |
187 | <Compile Include="Types\PrimData.cs"> | 184 | <Compile Include="Types\Login.cs"> |
188 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
189 | </Compile> | 186 | </Compile> |
190 | <Compile Include="Types\RegionHandle.cs"> | 187 | <Compile Include="Types\AssetLandmark.cs"> |
191 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
192 | </Compile> | 189 | </Compile> |
193 | <Compile Include="Types\RegionInfo.cs"> | 190 | <Compile Include="Types\AssetBase.cs"> |
194 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
195 | </Compile> | 192 | </Compile> |
196 | </ItemGroup> | 193 | </ItemGroup> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build index a18838b..0d8077b 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.dll.build +++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build | |||
@@ -11,41 +11,40 @@ | |||
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentInventory.cs" /> | ||
15 | <include name="AuthenticateSessionBase.cs" /> | 14 | <include name="AuthenticateSessionBase.cs" /> |
15 | <include name="Remoting.cs" /> | ||
16 | <include name="RegionCommsListener.cs" /> | ||
16 | <include name="BlockingQueue.cs" /> | 17 | <include name="BlockingQueue.cs" /> |
17 | <include name="IRegionCommsListener.cs" /> | 18 | <include name="IRegionCommsListener.cs" /> |
18 | <include name="Logger.cs" /> | ||
19 | <include name="LoginService.cs" /> | ||
20 | <include name="RegionCommsListener.cs" /> | ||
21 | <include name="Remoting.cs" /> | ||
22 | <include name="SimProfile.cs" /> | ||
23 | <include name="UserProfile.cs" /> | ||
24 | <include name="Util.cs" /> | 19 | <include name="Util.cs" /> |
20 | <include name="UserProfile.cs" /> | ||
21 | <include name="SimProfile.cs" /> | ||
22 | <include name="LoginService.cs" /> | ||
23 | <include name="AgentInventory.cs" /> | ||
25 | <include name="Interfaces/AuthenticateResponse.cs" /> | 24 | <include name="Interfaces/AuthenticateResponse.cs" /> |
25 | <include name="Interfaces/IUserServer.cs" /> | ||
26 | <include name="Interfaces/IAssetServer.cs" /> | 26 | <include name="Interfaces/IAssetServer.cs" /> |
27 | <include name="Interfaces/IWorld.cs" /> | ||
27 | <include name="Interfaces/IClientAPI.cs" /> | 28 | <include name="Interfaces/IClientAPI.cs" /> |
28 | <include name="Interfaces/ILocalStorage.cs" /> | 29 | <include name="Interfaces/ILocalStorage.cs" /> |
29 | <include name="Interfaces/IUserServer.cs" /> | ||
30 | <include name="Interfaces/IWorld.cs" /> | ||
31 | <include name="Interfaces/Config/IGenericConfig.cs" /> | 30 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
32 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
33 | <include name="Interfaces/Config/IUserConfig.cs" /> | 31 | <include name="Interfaces/Config/IUserConfig.cs" /> |
32 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
34 | <include name="Properties/AssemblyInfo.cs" /> | 33 | <include name="Properties/AssemblyInfo.cs" /> |
35 | <include name="Types/AgentCiruitData.cs" /> | ||
36 | <include name="Types/AgentWearable.cs" /> | ||
37 | <include name="Types/AssetBase.cs" /> | ||
38 | <include name="Types/AssetLandmark.cs" /> | ||
39 | <include name="Types/AssetStorage.cs" /> | ||
40 | <include name="Types/EstateSettings.cs" /> | ||
41 | <include name="Types/Login.cs" /> | ||
42 | <include name="Types/MapBlockData.cs" /> | ||
43 | <include name="Types/NeighbourInfo.cs" /> | 34 | <include name="Types/NeighbourInfo.cs" /> |
44 | <include name="Types/NetworkServersInfo.cs" /> | 35 | <include name="Types/NetworkServersInfo.cs" /> |
45 | <include name="Types/ParcelData.cs" /> | ||
46 | <include name="Types/PrimData.cs" /> | ||
47 | <include name="Types/RegionHandle.cs" /> | 36 | <include name="Types/RegionHandle.cs" /> |
48 | <include name="Types/RegionInfo.cs" /> | 37 | <include name="Types/RegionInfo.cs" /> |
38 | <include name="Types/ParcelData.cs" /> | ||
39 | <include name="Types/AgentWearable.cs" /> | ||
40 | <include name="Types/PrimData.cs" /> | ||
41 | <include name="Types/MapBlockData.cs" /> | ||
42 | <include name="Types/AssetStorage.cs" /> | ||
43 | <include name="Types/EstateSettings.cs" /> | ||
44 | <include name="Types/AgentCiruitData.cs" /> | ||
45 | <include name="Types/Login.cs" /> | ||
46 | <include name="Types/AssetLandmark.cs" /> | ||
47 | <include name="Types/AssetBase.cs" /> | ||
49 | </sources> | 48 | </sources> |
50 | <references basedir="${project::get-base-directory()}"> | 49 | <references basedir="${project::get-base-directory()}"> |
51 | <lib> | 50 | <lib> |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj index 399f456..5262224 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj | |||
@@ -93,16 +93,16 @@ | |||
93 | <Compile Include="BaseHttpServer.cs"> | 93 | <Compile Include="BaseHttpServer.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="CheckSumServer.cs"> | 96 | <Compile Include="IRestHandler.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="IRestHandler.cs"> | 99 | <Compile Include="XmlRpcMethod.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="UDPServerBase.cs"> | 102 | <Compile Include="CheckSumServer.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="XmlRpcMethod.cs"> | 105 | <Compile Include="UDPServerBase.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | </ItemGroup> | 108 | </ItemGroup> |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build index 7401b07..96b937c 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build | |||
@@ -12,10 +12,10 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="BaseHttpServer.cs" /> | 14 | <include name="BaseHttpServer.cs" /> |
15 | <include name="CheckSumServer.cs" /> | ||
16 | <include name="IRestHandler.cs" /> | 15 | <include name="IRestHandler.cs" /> |
17 | <include name="UDPServerBase.cs" /> | ||
18 | <include name="XmlRpcMethod.cs" /> | 16 | <include name="XmlRpcMethod.cs" /> |
17 | <include name="CheckSumServer.cs" /> | ||
18 | <include name="UDPServerBase.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj index 02aa3f3..60c4b2f 100644 --- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj +++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj | |||
@@ -108,10 +108,10 @@ | |||
108 | </ProjectReference> | 108 | </ProjectReference> |
109 | </ItemGroup> | 109 | </ItemGroup> |
110 | <ItemGroup> | 110 | <ItemGroup> |
111 | <Compile Include="LoginResponse.cs"> | 111 | <Compile Include="UserManagerBase.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="UserManagerBase.cs"> | 114 | <Compile Include="LoginResponse.cs"> |
115 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
116 | </Compile> | 116 | </Compile> |
117 | </ItemGroup> | 117 | </ItemGroup> |
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build index 3ea339b..ced9276 100644 --- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build +++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LoginResponse.cs" /> | ||
15 | <include name="UserManagerBase.cs" /> | 14 | <include name="UserManagerBase.cs" /> |
15 | <include name="LoginResponse.cs" /> | ||
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |