* Moved OpenSim/Framework/General to OpenSim/Framework for great justice.

44 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/General/ACL.cs b/OpenSim/Framework/ACL.cs
index 8f9c6e7..8f9c6e7 100644
--- a/OpenSim/Framework/General/ACL.cs
+++ b/OpenSim/Framework/ACL.cs
diff --git a/OpenSim/Framework/General/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 3658feb..3658feb 100644
--- a/OpenSim/Framework/General/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
diff --git a/OpenSim/Framework/General/AgentCiruitData.cs b/OpenSim/Framework/AgentCiruitData.cs
index 3f17ca8..3f17ca8 100644
--- a/OpenSim/Framework/General/AgentCiruitData.cs
+++ b/OpenSim/Framework/AgentCiruitData.cs
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index 7a1174a..7a1174a 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
diff --git a/OpenSim/Framework/General/AgentWearable.cs b/OpenSim/Framework/AgentWearable.cs
index a324cb3..a324cb3 100644
--- a/OpenSim/Framework/General/AgentWearable.cs
+++ b/OpenSim/Framework/AgentWearable.cs
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs
index b3206a7..b3206a7 100644
--- a/OpenSim/Framework/General/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssemblyInfo.cs
diff --git a/OpenSim/Framework/General/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index ef1ee71..ef1ee71 100644
--- a/OpenSim/Framework/General/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
diff --git a/OpenSim/Framework/General/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index fe77ab8..fe77ab8 100644
--- a/OpenSim/Framework/General/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
diff --git a/OpenSim/Framework/General/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index 4422331..4422331 100644
--- a/OpenSim/Framework/General/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
diff --git a/OpenSim/Framework/General/AssetStorage.cs b/OpenSim/Framework/AssetStorage.cs
index 9d3de5b..9d3de5b 100644
--- a/OpenSim/Framework/General/AssetStorage.cs
+++ b/OpenSim/Framework/AssetStorage.cs
diff --git a/OpenSim/Framework/General/AuthenticateResponse.cs b/OpenSim/Framework/AuthenticateResponse.cs
index 88a8713..88a8713 100644
--- a/OpenSim/Framework/General/AuthenticateResponse.cs
+++ b/OpenSim/Framework/AuthenticateResponse.cs
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 006fbc8..006fbc8 100644
--- a/OpenSim/Framework/General/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index e34c051..e34c051 100644
--- a/OpenSim/Framework/General/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
diff --git a/OpenSim/Framework/General/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index b68896c..b68896c 100644
--- a/OpenSim/Framework/General/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
diff --git a/OpenSim/Framework/General/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index ec39d3d..ec39d3d 100644
--- a/OpenSim/Framework/General/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
diff --git a/OpenSim/Framework/General/Culture.cs b/OpenSim/Framework/Culture.cs
index f8cadfe..f8cadfe 100644
--- a/OpenSim/Framework/General/Culture.cs
+++ b/OpenSim/Framework/Culture.cs
diff --git a/OpenSim/Framework/General/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 63b62c6..63b62c6 100644
--- a/OpenSim/Framework/General/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
diff --git a/OpenSim/Framework/General/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 021e6c5..021e6c5 100644
--- a/OpenSim/Framework/General/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
diff --git a/OpenSim/Framework/General/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
index ad1cf66..ad1cf66 100644
--- a/OpenSim/Framework/General/IAssetProvider.cs
+++ b/OpenSim/Framework/IAssetProvider.cs
diff --git a/OpenSim/Framework/General/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 9a7dbab..9a7dbab 100644
--- a/OpenSim/Framework/General/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
diff --git a/OpenSim/Framework/General/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4482ae6..4482ae6 100644
--- a/OpenSim/Framework/General/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
diff --git a/OpenSim/Framework/General/IGenericConfig.cs b/OpenSim/Framework/IGenericConfig.cs
index 889d178..889d178 100644
--- a/OpenSim/Framework/General/IGenericConfig.cs
+++ b/OpenSim/Framework/IGenericConfig.cs
diff --git a/OpenSim/Framework/General/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
index e649274..e649274 100644
--- a/OpenSim/Framework/General/IPlugin.cs
+++ b/OpenSim/Framework/IPlugin.cs
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index 1a24469..1a24469 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
diff --git a/OpenSim/Framework/General/IScene.cs b/OpenSim/Framework/IScene.cs
index 3d6ca1c..3d6ca1c 100644
--- a/OpenSim/Framework/General/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
diff --git a/OpenSim/Framework/General/IUserData.cs b/OpenSim/Framework/IUserData.cs
index cb2502a..cb2502a 100644
--- a/OpenSim/Framework/General/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
diff --git a/OpenSim/Framework/General/IUserService.cs b/OpenSim/Framework/IUserService.cs
index ed9032b..ed9032b 100644
--- a/OpenSim/Framework/General/IUserService.cs
+++ b/OpenSim/Framework/IUserService.cs
diff --git a/OpenSim/Framework/General/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 8e64b68..8e64b68 100644
--- a/OpenSim/Framework/General/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
diff --git a/OpenSim/Framework/General/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 331013f..331013f 100644
--- a/OpenSim/Framework/General/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
diff --git a/OpenSim/Framework/General/LandData.cs b/OpenSim/Framework/LandData.cs
index ca948ef..ca948ef 100644
--- a/OpenSim/Framework/General/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
diff --git a/OpenSim/Framework/General/Login.cs b/OpenSim/Framework/Login.cs
index 7ceed19..7ceed19 100644
--- a/OpenSim/Framework/General/Login.cs
+++ b/OpenSim/Framework/Login.cs
diff --git a/OpenSim/Framework/General/MapBlockData.cs b/OpenSim/Framework/MapBlockData.cs
index 8609533..8609533 100644
--- a/OpenSim/Framework/General/MapBlockData.cs
+++ b/OpenSim/Framework/MapBlockData.cs
diff --git a/OpenSim/Framework/General/NeighbourInfo.cs b/OpenSim/Framework/NeighbourInfo.cs
index d5a0a2f..d5a0a2f 100644
--- a/OpenSim/Framework/General/NeighbourInfo.cs
+++ b/OpenSim/Framework/NeighbourInfo.cs
diff --git a/OpenSim/Framework/General/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index b9ce143..b9ce143 100644
--- a/OpenSim/Framework/General/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
diff --git a/OpenSim/Framework/General/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 5cdbfb2..5cdbfb2 100644
--- a/OpenSim/Framework/General/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index ee0d503..ee0d503 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
diff --git a/OpenSim/Framework/General/RegionHandle.cs b/OpenSim/Framework/RegionHandle.cs
index 440aaf6..440aaf6 100644
--- a/OpenSim/Framework/General/RegionHandle.cs
+++ b/OpenSim/Framework/RegionHandle.cs
diff --git a/OpenSim/Framework/General/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 1257849..1257849 100644
--- a/OpenSim/Framework/General/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/Remoting.cs
index 667ae69..667ae69 100644
--- a/OpenSim/Framework/General/Remoting.cs
+++ b/OpenSim/Framework/Remoting.cs
diff --git a/OpenSim/Framework/General/UUID.cs b/OpenSim/Framework/UUID.cs
index 3b292b1..3b292b1 100644
--- a/OpenSim/Framework/General/UUID.cs
+++ b/OpenSim/Framework/UUID.cs
diff --git a/OpenSim/Framework/General/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index fdb8f82..fdb8f82 100644
--- a/OpenSim/Framework/General/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
diff --git a/OpenSim/Framework/General/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index d10aa36..d10aa36 100644
--- a/OpenSim/Framework/General/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/Util.cs
index c731561..c731561 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/Util.cs
diff --git a/prebuild.xml b/prebuild.xml
index 79f8d3a..ddf90ab 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -53,19 +53,19 @@
       </Files>
     </Project>
         
-    <Project name="OpenSim.Framework" path="OpenSim/Framework/General" type="Library">
+    <Project name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
@@ -75,7 +75,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="Nini.dll" />
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="false"/>
       </Files>
     </Project>