*Master User is now set up

*Added support for getting user profile information from remote grid server (untested)
*Updated prebuild.xml

2 files changed, 30 insertions, 30 deletions

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 4069454..9f8d2c3 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -148,64 +148,64 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="EstateManager.cs">

+    <Compile Include="RegionManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ParcelManager.cs">

+    <Compile Include="EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionManager.cs">

+    <Compile Include="ParcelManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Entity.cs">

+    <Compile Include="Scenes\ScenePresence.Body.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\IScenePresenceBody.cs">

+    <Compile Include="Scenes\SceneEvents.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Primitive.cs">

+    <Compile Include="Scenes\ScenePresence.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Scene.cs">

+    <Compile Include="Scenes\ScenePresence.Animations.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\Scene.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneBase.cs">

+    <Compile Include="Scenes\SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneEvents.cs">

+    <Compile Include="Scenes\Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneObject.cs">

+    <Compile Include="Scenes\IScenePresenceBody.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.Animations.cs">

+    <Compile Include="Scenes\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.Body.cs">

+    <Compile Include="Scenes\SceneBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.cs">

+    <Compile Include="Scenes\Scene.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Script.cs">

+    <Compile Include="Scenes\scripting\ScriptManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\scripting\ScriptInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\ScriptManager.cs">

+    <Compile Include="Scenes\scripting\Script.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">

+    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">

+    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 51924d5..667f1d7 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="RegionManager.cs" />

                 <include name="EstateManager.cs" />

                 <include name="ParcelManager.cs" />

-                <include name="RegionManager.cs" />

-                <include name="Scenes/Entity.cs" />

-                <include name="Scenes/IScenePresenceBody.cs" />

-                <include name="Scenes/Primitive.cs" />

-                <include name="Scenes/Scene.cs" />

-                <include name="Scenes/Scene.PacketHandlers.cs" />

-                <include name="Scenes/SceneBase.cs" />

-                <include name="Scenes/SceneEvents.cs" />

-                <include name="Scenes/SceneObject.cs" />

-                <include name="Scenes/ScenePresence.Animations.cs" />

                 <include name="Scenes/ScenePresence.Body.cs" />

+                <include name="Scenes/SceneEvents.cs" />

                 <include name="Scenes/ScenePresence.cs" />

-                <include name="Scenes/scripting/Script.cs" />

-                <include name="Scenes/scripting/ScriptInfo.cs" />

+                <include name="Scenes/ScenePresence.Animations.cs" />

+                <include name="Scenes/Scene.PacketHandlers.cs" />

+                <include name="Scenes/SceneObject.cs" />

+                <include name="Scenes/Primitive.cs" />

+                <include name="Scenes/IScenePresenceBody.cs" />

+                <include name="Scenes/Entity.cs" />

+                <include name="Scenes/SceneBase.cs" />

+                <include name="Scenes/Scene.cs" />

                 <include name="Scenes/scripting/ScriptManager.cs" />

+                <include name="Scenes/scripting/ScriptInfo.cs" />

+                <include name="Scenes/scripting/Script.cs" />

                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />

-                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />

                 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />

+                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>