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 | |
parent | * Project files fixed for OGS. (diff) | |
download | opensim-SC_OLD-5e805656db1215518a344d6d5364629a4997fd47.zip opensim-SC_OLD-5e805656db1215518a344d6d5364629a4997fd47.tar.gz opensim-SC_OLD-5e805656db1215518a344d6d5364629a4997fd47.tar.bz2 opensim-SC_OLD-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')
-rw-r--r-- | OpenSim/Framework/Data/OpenSim.Framework.Data.csproj | 12 | ||||
-rw-r--r-- | OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Data/UserProfileData.cs | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj index 47b9ba3..dcafbcd 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj | |||
@@ -78,15 +78,9 @@ | |||
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | </ItemGroup> | 79 | </ItemGroup> |
80 | <ItemGroup> | 80 | <ItemGroup> |
81 | <Compile Include="ReservationData.cs"> | ||
82 | <SubType>Code</SubType> | ||
83 | </Compile> | ||
84 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
85 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
86 | </Compile> | 83 | </Compile> |
87 | <Compile Include="SimProfileData.cs"> | ||
88 | <SubType>Code</SubType> | ||
89 | </Compile> | ||
90 | <Compile Include="ILogData.cs"> | 84 | <Compile Include="ILogData.cs"> |
91 | <SubType>Code</SubType> | 85 | <SubType>Code</SubType> |
92 | </Compile> | 86 | </Compile> |
@@ -96,6 +90,12 @@ | |||
96 | <Compile Include="InventoryData.cs"> | 90 | <Compile Include="InventoryData.cs"> |
97 | <SubType>Code</SubType> | 91 | <SubType>Code</SubType> |
98 | </Compile> | 92 | </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"> | 99 | <Compile Include="UserData.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build index 881bb3a..aefb02b 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" /> | ||
15 | <include name="GridData.cs" /> | 14 | <include name="GridData.cs" /> |
16 | <include name="SimProfileData.cs" /> | ||
17 | <include name="ILogData.cs" /> | 15 | <include name="ILogData.cs" /> |
18 | <include name="IniConfig.cs" /> | 16 | <include name="IniConfig.cs" /> |
19 | <include name="InventoryData.cs" /> | 17 | <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/Data/UserProfileData.cs b/OpenSim/Framework/Data/UserProfileData.cs index 00d422d..ac168e0 100644 --- a/OpenSim/Framework/Data/UserProfileData.cs +++ b/OpenSim/Framework/Data/UserProfileData.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Data | |||
136 | /// <summary> | 136 | /// <summary> |
137 | /// The IP address of the user | 137 | /// The IP address of the user |
138 | /// </summary> | 138 | /// </summary> |
139 | public string agentIP; | 139 | public string agentIP = String.Empty; |
140 | /// <summary> | 140 | /// <summary> |
141 | /// The port of the user | 141 | /// The port of the user |
142 | /// </summary> | 142 | /// </summary> |