From ffd7a6b8c22cd21e355f77fea20b145424e3d912 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 11 Apr 2007 09:45:48 +0000
Subject: Changed so that a bin\ScriptEngines\ directory will be searched for
 scripting Engines. Added the work in progress JVM scripting engine.

---
 OpenSim.Framework/OpenSim.Framework.csproj    |   9 ++
 OpenSim.Framework/OpenSim.Framework.dll.build | 137 +++++++++++++-------------
 OpenSim.Framework/UserProfileManager.cs       |   2 -
 3 files changed, 79 insertions(+), 69 deletions(-)

(limited to 'OpenSim.Framework')

diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 4ce5af0..68b7ef0 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -111,6 +111,12 @@
     <Compile Include="ILocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="IScriptAPI.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IScriptEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="IUserConfig.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -129,6 +135,9 @@
     <Compile Include="NeighbourInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="OSVector3.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="PrimData.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index b351625..fb7fbd4 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,67 +1,70 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Framework" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Framework" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AgentCiruitData.cs" />
-                <include name="AgentInventory.cs" />
-                <include name="AssetBase.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="HeightMapGenHills.cs" />
-                <include name="IAssetServer.cs" />
-                <include name="IConfig.cs" />
-                <include name="IGenericConfig.cs" />
-                <include name="IGridConfig.cs" />
-                <include name="IGridServer.cs" />
-                <include name="ILocalStorage.cs" />
-                <include name="IUserConfig.cs" />
-                <include name="IUserServer.cs" />
-                <include name="LocalGridBase.cs" />
-                <include name="Login.cs" />
-                <include name="LoginService.cs" />
-                <include name="NeighbourInfo.cs" />
-                <include name="PrimData.cs" />
-                <include name="RemoteGridBase.cs" />
-                <include name="SimProfile.cs" />
-                <include name="SimProfileBase.cs" />
-                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="Util.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>
+<project name="OpenSim.Framework" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Framework" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AgentCiruitData.cs" />
+                <include name="AgentInventory.cs" />
+                <include name="AssetBase.cs" />
+                <include name="BlockingQueue.cs" />
+                <include name="HeightMapGenHills.cs" />
+                <include name="IAssetServer.cs" />
+                <include name="IConfig.cs" />
+                <include name="IGenericConfig.cs" />
+                <include name="IGridConfig.cs" />
+                <include name="IGridServer.cs" />
+                <include name="ILocalStorage.cs" />
+                <include name="IScriptAPI.cs" />
+                <include name="IScriptEngine.cs" />
+                <include name="IUserConfig.cs" />
+                <include name="IUserServer.cs" />
+                <include name="LocalGridBase.cs" />
+                <include name="Login.cs" />
+                <include name="LoginService.cs" />
+                <include name="NeighbourInfo.cs" />
+                <include name="OSVector3.cs" />
+                <include name="PrimData.cs" />
+                <include name="RemoteGridBase.cs" />
+                <include name="SimProfile.cs" />
+                <include name="SimProfileBase.cs" />
+                <include name="UserProfile.cs" />
+                <include name="UserProfileManager.cs" />
+                <include name="UserProfileManagerBase.cs" />
+                <include name="Util.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <copy todir="${project::get-base-directory()}/../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 3f0d665..bf11910 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -185,8 +185,6 @@ namespace OpenSim.Framework.User
                     response.Value = responseData;
  //                   TheUser.SendDataToSim(SimInfo);
 
-
-
                 }
                 catch (Exception E)
                 {
-- 
cgit v1.1