aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj62
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj.user12
2 files changed, 31 insertions, 43 deletions
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index e164d5a..7f71949 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -94,112 +94,112 @@
94 <Compile Include="AuthenticateSessionBase.cs"> 94 <Compile Include="AuthenticateSessionBase.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="BlockingQueue.cs"> 97 <Compile Include="Util.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="IRegionCommsListener.cs"> 100 <Compile Include="Logger.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="LLSDHelpers.cs"> 103 <Compile Include="LLSDHelpers.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="Logger.cs"> 106 <Compile Include="Remoting.cs">
107 <SubType>Code</SubType>
108 </Compile>
109 <Compile Include="LoginService.cs">
110 <SubType>Code</SubType> 107 <SubType>Code</SubType>
111 </Compile> 108 </Compile>
112 <Compile Include="RegionCommsListener.cs"> 109 <Compile Include="RegionCommsListener.cs">
113 <SubType>Code</SubType> 110 <SubType>Code</SubType>
114 </Compile> 111 </Compile>
115 <Compile Include="Remoting.cs"> 112 <Compile Include="LoginService.cs">
116 <SubType>Code</SubType> 113 <SubType>Code</SubType>
117 </Compile> 114 </Compile>
118 <Compile Include="SimProfile.cs"> 115 <Compile Include="BlockingQueue.cs">
119 <SubType>Code</SubType> 116 <SubType>Code</SubType>
120 </Compile> 117 </Compile>
121 <Compile Include="UserProfile.cs"> 118 <Compile Include="UserProfile.cs">
122 <SubType>Code</SubType> 119 <SubType>Code</SubType>
123 </Compile> 120 </Compile>
124 <Compile Include="Util.cs"> 121 <Compile Include="IRegionCommsListener.cs">
122 <SubType>Code</SubType>
123 </Compile>
124 <Compile Include="SimProfile.cs">
125 <SubType>Code</SubType> 125 <SubType>Code</SubType>
126 </Compile> 126 </Compile>
127 <Compile Include="Interfaces\AuthenticateResponse.cs"> 127 <Compile Include="Interfaces\AuthenticateResponse.cs">
128 <SubType>Code</SubType> 128 <SubType>Code</SubType>
129 </Compile> 129 </Compile>
130 <Compile Include="Interfaces\IUserServer.cs">
131 <SubType>Code</SubType>
132 </Compile>
130 <Compile Include="Interfaces\IAssetServer.cs"> 133 <Compile Include="Interfaces\IAssetServer.cs">
131 <SubType>Code</SubType> 134 <SubType>Code</SubType>
132 </Compile> 135 </Compile>
136 <Compile Include="Interfaces\IWorld.cs">
137 <SubType>Code</SubType>
138 </Compile>
133 <Compile Include="Interfaces\IClientAPI.cs"> 139 <Compile Include="Interfaces\IClientAPI.cs">
134 <SubType>Code</SubType> 140 <SubType>Code</SubType>
135 </Compile> 141 </Compile>
136 <Compile Include="Interfaces\ILocalStorage.cs"> 142 <Compile Include="Interfaces\ILocalStorage.cs">
137 <SubType>Code</SubType> 143 <SubType>Code</SubType>
138 </Compile> 144 </Compile>
139 <Compile Include="Interfaces\IUserServer.cs"> 145 <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
140 <SubType>Code</SubType> 146 <SubType>Code</SubType>
141 </Compile> 147 </Compile>
142 <Compile Include="Interfaces\IWorld.cs"> 148 <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
143 <SubType>Code</SubType> 149 <SubType>Code</SubType>
144 </Compile> 150 </Compile>
145 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 151 <Compile Include="Interfaces\Config\IGenericConfig.cs">
146 <SubType>Code</SubType> 152 <SubType>Code</SubType>
147 </Compile> 153 </Compile>
148 <Compile Include="Interfaces\Config\IGridConfig.cs">
149 <SubType>Code</SubType>
150 </Compile>
151 <Compile Include="Interfaces\Config\IUserConfig.cs"> 154 <Compile Include="Interfaces\Config\IUserConfig.cs">
152 <SubType>Code</SubType> 155 <SubType>Code</SubType>
153 </Compile> 156 </Compile>
154 <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> 157 <Compile Include="Interfaces\Config\IGridConfig.cs">
155 <SubType>Code</SubType>
156 </Compile>
157 <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="Properties\AssemblyInfo.cs"> 160 <Compile Include="Properties\AssemblyInfo.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="Types\AgentCiruitData.cs"> 163 <Compile Include="Types\NeighbourInfo.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="Types\AgentWearable.cs"> 166 <Compile Include="Types\NetworkServersInfo.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Types\AssetBase.cs"> 169 <Compile Include="Types\RegionHandle.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="Types\AssetLandmark.cs"> 172 <Compile Include="Types\RegionInfo.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="Types\AssetStorage.cs"> 175 <Compile Include="Types\ParcelData.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="Types\EstateSettings.cs"> 178 <Compile Include="Types\AgentWearable.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="Types\Login.cs"> 181 <Compile Include="Types\PrimData.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="Types\MapBlockData.cs"> 184 <Compile Include="Types\MapBlockData.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 <Compile Include="Types\NeighbourInfo.cs"> 187 <Compile Include="Types\AssetStorage.cs">
188 <SubType>Code</SubType> 188 <SubType>Code</SubType>
189 </Compile> 189 </Compile>
190 <Compile Include="Types\NetworkServersInfo.cs"> 190 <Compile Include="Types\EstateSettings.cs">
191 <SubType>Code</SubType> 191 <SubType>Code</SubType>
192 </Compile> 192 </Compile>
193 <Compile Include="Types\ParcelData.cs"> 193 <Compile Include="Types\AgentCiruitData.cs">
194 <SubType>Code</SubType> 194 <SubType>Code</SubType>
195 </Compile> 195 </Compile>
196 <Compile Include="Types\PrimData.cs"> 196 <Compile Include="Types\Login.cs">
197 <SubType>Code</SubType> 197 <SubType>Code</SubType>
198 </Compile> 198 </Compile>
199 <Compile Include="Types\RegionHandle.cs"> 199 <Compile Include="Types\AssetLandmark.cs">
200 <SubType>Code</SubType> 200 <SubType>Code</SubType>
201 </Compile> 201 </Compile>
202 <Compile Include="Types\RegionInfo.cs"> 202 <Compile Include="Types\AssetBase.cs">
203 <SubType>Code</SubType> 203 <SubType>Code</SubType>
204 </Compile> 204 </Compile>
205 </ItemGroup> 205 </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj.user b/OpenSim/Framework/General/OpenSim.Framework.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>