ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Deleted Logger.cs from OpenSim.Framework

Browse Source
This commit is contained in:
mingchen
2007-06-29 16:43:48 +00:00
parent b2883faddf
commit 6b3777d3db
37 changed files with 263 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
View File

@@ -86,16 +86,16 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="CommunicationsManager.cs">
<Compile Include="IUserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGridServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IInterRegionCommunications.cs">
<Compile Include="CommunicationsManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IUserServices.cs">
<Compile Include="IInterRegionCommunications.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

6
OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
View File

@@ -11,10 +11,10 @@
<resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="CommunicationsManager.cs" />
<include name="IGridServices.cs" />
<include name="IInterRegionCommunications.cs" />
<include name="IUserServices.cs" />
<include name="IGridServices.cs" />
<include name="CommunicationsManager.cs" />
<include name="IInterRegionCommunications.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

4
OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
View File

@@ -69,10 +69,10 @@
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ConsoleCallbacksBase.cs">
<Compile Include="LogBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LogBase.cs">
<Compile Include="ConsoleCallbacksBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MainLog.cs">

2
OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
View File

@@ -12,8 +12,8 @@
</resources>
<sources failonempty="true">
<include name="AssemblyInfo.cs" />
<include name="ConsoleCallbacksBase.cs" />
<include name="LogBase.cs" />
<include name="ConsoleCallbacksBase.cs" />
<include name="MainLog.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

4
OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
View File

@@ -88,13 +88,13 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="DB4oGridData.cs">
<Compile Include="DB4oUserData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DB4oManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DB4oUserData.cs">
<Compile Include="DB4oGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

4
OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
View File

@@ -11,9 +11,9 @@
<resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="DB4oGridData.cs" />
<include name="DB4oManager.cs" />
<include name="DB4oUserData.cs" />
<include name="DB4oManager.cs" />
<include name="DB4oGridData.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

10
OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
View File

@@ -88,19 +88,19 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MySQLGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLInventoryData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLLogData.cs">
<Compile Include="MySQLUserData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLUserData.cs">
<Compile Include="MySQLLogData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

6
OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
View File

@@ -11,11 +11,11 @@
<resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="MySQLGridData.cs" />
<include name="MySQLInventoryData.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLUserData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLGridData.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

4
OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
View File

@@ -88,10 +88,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="SQLiteGridData.cs">
<Compile Include="SQLiteManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SQLiteManager.cs">
<Compile Include="SQLiteGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

2
OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
View File

@@ -11,8 +11,8 @@
<resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="SQLiteGridData.cs" />
<include name="SQLiteManager.cs" />
<include name="SQLiteGridData.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

12
OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
View File

@@ -78,9 +78,15 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<Compile Include="ReservationData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="GridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ILogData.cs">
<SubType>Code</SubType>
</Compile>
@@ -90,12 +96,6 @@
<Compile Include="InventoryData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ReservationData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserData.cs">
<SubType>Code</SubType>
</Compile>

4
OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
View File

@@ -11,12 +11,12 @@
<resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="ReservationData.cs" />
<include name="GridData.cs" />
<include name="SimProfileData.cs" />
<include name="ILogData.cs" />
<include name="IniConfig.cs" />
<include name="InventoryData.cs" />
<include name="ReservationData.cs" />
<include name="SimProfileData.cs" />
<include name="UserData.cs" />
<include name="UserProfileData.cs" />
<include name="Properties/AssemblyInfo.cs" />

85
OpenSim/Framework/General/Logger.cs
View File

@@ -1,85 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{
public class Logger
{
public static Logger Instance = new Logger( false );
public delegate void LoggerMethodDelegate();
private delegate bool LoggerDelegate( LoggerMethodDelegate whatToDo );
private LoggerDelegate m_delegate;
public Logger( bool log )
{
if( log )
{
m_delegate = CatchAndLog;
}
else
{
m_delegate = DontCatch;
}
}
public bool Wrap( LoggerMethodDelegate whatToDo )
{
return m_delegate( whatToDo );
}
private bool CatchAndLog(LoggerMethodDelegate whatToDo)
{
try
{
whatToDo();
return true;
}
catch(Exception e)
{
System.Console.WriteLine( "Exception logged!!! Woah!!!!" );
return false;
}
}
private bool DontCatch(LoggerMethodDelegate whatToDo)
{
whatToDo();
return true;
}
public class LoggerExample
{
public void TryWrap()
{
// This will log and ignore
Logger log = new Logger(true);
log.Wrap(delegate()
{
Int16.Parse("waa!");
});
// This will throw;
try
{
log = new Logger(false);
log.Wrap(delegate()
{
Int16.Parse("waa!");
});
}
catch
{
System.Console.WriteLine("Example barfed!");
}
}
}
}
}

99
OpenSim/Framework/General/OpenSim.Framework.csproj
View File

@@ -88,10 +88,13 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="AgentInventory.cs">
<Compile Include="AuthenticateSessionBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AuthenticateSessionBase.cs">
<Compile Include="Remoting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="BlockingQueue.cs">
@@ -100,97 +103,91 @@
<Compile Include="IRegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Logger.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Remoting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfile.cs">
<Compile Include="Util.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserProfile.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Util.cs">
<Compile Include="SimProfile.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AgentInventory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\AuthenticateResponse.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IAssetServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IClientAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGenericConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentWearable.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetLandmark.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\EstateSettings.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\MapBlockData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NeighbourInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NetworkServersInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionHandle.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\ParcelData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentWearable.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\PrimData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionHandle.cs">
<Compile Include="Types\MapBlockData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionInfo.cs">
<Compile Include="Types\AssetStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\EstateSettings.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetLandmark.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

39
OpenSim/Framework/General/OpenSim.Framework.dll.build
View File

@@ -11,41 +11,40 @@
<resources prefix="OpenSim.Framework" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="AgentInventory.cs" />
<include name="AuthenticateSessionBase.cs" />
<include name="Remoting.cs" />
<include name="RegionCommsListener.cs" />
<include name="BlockingQueue.cs" />
<include name="IRegionCommsListener.cs" />
<include name="Logger.cs" />
<include name="LoginService.cs" />
<include name="RegionCommsListener.cs" />
<include name="Remoting.cs" />
<include name="SimProfile.cs" />
<include name="UserProfile.cs" />
<include name="Util.cs" />
<include name="UserProfile.cs" />
<include name="SimProfile.cs" />
<include name="LoginService.cs" />
<include name="AgentInventory.cs" />
<include name="Interfaces/AuthenticateResponse.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/IAssetServer.cs" />
<include name="Interfaces/IWorld.cs" />
<include name="Interfaces/IClientAPI.cs" />
<include name="Interfaces/ILocalStorage.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/IWorld.cs" />
<include name="Interfaces/Config/IGenericConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" />
<include name="Interfaces/Config/IUserConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" />
<include name="Properties/AssemblyInfo.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/AgentWearable.cs" />
<include name="Types/AssetBase.cs" />
<include name="Types/AssetLandmark.cs" />
<include name="Types/AssetStorage.cs" />
<include name="Types/EstateSettings.cs" />
<include name="Types/Login.cs" />
<include name="Types/MapBlockData.cs" />
<include name="Types/NeighbourInfo.cs" />
<include name="Types/NetworkServersInfo.cs" />
<include name="Types/ParcelData.cs" />
<include name="Types/PrimData.cs" />
<include name="Types/RegionHandle.cs" />
<include name="Types/RegionInfo.cs" />
<include name="Types/ParcelData.cs" />
<include name="Types/AgentWearable.cs" />
<include name="Types/PrimData.cs" />
<include name="Types/MapBlockData.cs" />
<include name="Types/AssetStorage.cs" />
<include name="Types/EstateSettings.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/Login.cs" />
<include name="Types/AssetLandmark.cs" />
<include name="Types/AssetBase.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>

10
OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
View File

@@ -93,16 +93,16 @@
<Compile Include="BaseHttpServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CheckSumServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IRestHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServerBase.cs">
<Compile Include="XmlRpcMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="XmlRpcMethod.cs">
<Compile Include="CheckSumServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServerBase.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

4
OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
View File

@@ -12,10 +12,10 @@
</resources>
<sources failonempty="true">
<include name="BaseHttpServer.cs" />
<include name="CheckSumServer.cs" />
<include name="IRestHandler.cs" />
<include name="UDPServerBase.cs" />
<include name="XmlRpcMethod.cs" />
<include name="CheckSumServer.cs" />
<include name="UDPServerBase.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>

4
OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
View File

@@ -108,10 +108,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="LoginResponse.cs">
<Compile Include="UserManagerBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserManagerBase.cs">
<Compile Include="LoginResponse.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

2
OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
View File

@@ -11,8 +11,8 @@
<resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="LoginResponse.cs" />
<include name="UserManagerBase.cs" />
<include name="LoginResponse.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>