diff options
author | lbsa71 | 2007-07-01 13:17:27 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-01 13:17:27 +0000 |
commit | 5e805656db1215518a344d6d5364629a4997fd47 (patch) | |
tree | 2d8b50bac8e77f983e3016e969df3535c52fb0d3 /OpenSim/Framework/Data.DB4o | |
parent | * Project files fixed for OGS. (diff) | |
download | opensim-SC-5e805656db1215518a344d6d5364629a4997fd47.zip opensim-SC-5e805656db1215518a344d6d5364629a4997fd47.tar.gz opensim-SC-5e805656db1215518a344d6d5364629a4997fd47.tar.bz2 opensim-SC-5e805656db1215518a344d6d5364629a4997fd47.tar.xz |
Fixed SimpleApp - aka thankgoditssundaycommit
* Updated SimpleApp with various introduced dependencies
* Extracted ScenePrescence creation in Scene
* removed try-catchall from UserManagerBase (that actually hid a bug)
* Refactored RegionInfo
* handle is calculated
* it will explode upon accessing x,y,ip,port,externalip if not explicitly initialized
* Removed superfluous 'ref' keywords
* Removed a shitload of 'catch Exception e' that causes build warnings
* Lots of small refactorings, renames et c
* Ignored some bins
Diffstat (limited to 'OpenSim/Framework/Data.DB4o')
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs index 3870a8c..bd4cea8 100644 --- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs +++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Data.DB4o | |||
89 | database.Close(); | 89 | database.Close(); |
90 | return true; | 90 | return true; |
91 | } | 91 | } |
92 | catch (Exception e) | 92 | catch (Exception) |
93 | { | 93 | { |
94 | return false; | 94 | return false; |
95 | } | 95 | } |
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Data.DB4o | |||
154 | database.Close(); | 154 | database.Close(); |
155 | return true; | 155 | return true; |
156 | } | 156 | } |
157 | catch (Exception e) | 157 | catch (Exception) |
158 | { | 158 | { |
159 | return false; | 159 | return false; |
160 | } | 160 | } |
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs index 8caa75d..3ab0073 100644 --- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs +++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Data.DB4o | |||
100 | { | 100 | { |
101 | return getUserByUUID(uuid).currentAgent; | 101 | return getUserByUUID(uuid).currentAgent; |
102 | } | 102 | } |
103 | catch (Exception e) | 103 | catch (Exception) |
104 | { | 104 | { |
105 | return null; | 105 | return null; |
106 | } | 106 | } |
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.Data.DB4o | |||
128 | { | 128 | { |
129 | return getUserByName(fname,lname).currentAgent; | 129 | return getUserByName(fname,lname).currentAgent; |
130 | } | 130 | } |
131 | catch (Exception e) | 131 | catch (Exception) |
132 | { | 132 | { |
133 | return null; | 133 | return null; |
134 | } | 134 | } |
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj index f6e8311..b09cecf 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="DB4oUserData.cs"> | 91 | <Compile Include="DB4oGridData.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="DB4oGridData.cs"> | 97 | <Compile Include="DB4oUserData.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 2c5e31b..f124eb5 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" /> | ||
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oGridData.cs" /> | 14 | <include name="DB4oGridData.cs" /> |
15 | <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()}"> |