aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
-rw-r--r--OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs36
-rw-r--r--OpenSim/Region/Modules/Python/PythonAPI/Console.cs21
-rw-r--r--OpenSim/Region/Modules/Python/PythonModule.cs48
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs2
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs12
-rw-r--r--ThirdPartyLicenses/IronPython.txt28
-rw-r--r--bin/IronMath.dllbin0 -> 45056 bytes
-rw-r--r--bin/IronPython.dllbin0 -> 1605632 bytes
-rw-r--r--prebuild.xml28
11 files changed, 173 insertions, 7 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index d60c205..b6f59e1 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -195,7 +195,7 @@ namespace OpenSim.Grid.UserServer
195 } 195 }
196 196
197 } 197 }
198 catch (WebException e) 198 catch (WebException)
199 { 199 {
200 m_log.ErrorFormat( 200 m_log.ErrorFormat(
201 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 201 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 41d9abf..0ea7e0a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2862,8 +2862,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2862 protected virtual void RegisterLocalPacketHandlers() 2862 protected virtual void RegisterLocalPacketHandlers()
2863 { 2863 {
2864 AddLocalPacketHandler(PacketType.LogoutRequest, Logout); 2864 AddLocalPacketHandler(PacketType.LogoutRequest, Logout);
2865 //BUG: Causes NullReferenceException FIXME. 2865 AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect);
2866// AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect);
2867 AddLocalPacketHandler(PacketType.AgentCachedTexture, AgentTextureCached); 2866 AddLocalPacketHandler(PacketType.AgentCachedTexture, AgentTextureCached);
2868 AddLocalPacketHandler(PacketType.MultipleObjectUpdate, MultipleObjUpdate); 2867 AddLocalPacketHandler(PacketType.MultipleObjectUpdate, MultipleObjUpdate);
2869 AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest); 2868 AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest);
diff --git a/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs b/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..e4d7852
--- /dev/null
+++ b/OpenSim/Region/Modules/Python/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("Python")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("Python")]
13[assembly: AssemblyCopyright("Copyright © 2008")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("5bd55f67-385d-4a43-893a-b5d2ea43f07d")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Build and Revision Numbers
33// by using the '*' as shown below:
34// [assembly: AssemblyVersion("1.0.*")]
35[assembly: AssemblyVersion("1.0.0.0")]
36[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs b/OpenSim/Region/Modules/Python/PythonAPI/Console.cs
new file mode 100644
index 0000000..0d23dc6
--- /dev/null
+++ b/OpenSim/Region/Modules/Python/PythonAPI/Console.cs
@@ -0,0 +1,21 @@
1using System;
2using System.Reflection;
3using log4net;
4
5namespace OpenSim.Region.Modules.Python.PythonAPI
6{
7 class Console
8 {
9 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
10
11 public void WriteLine(string txt)
12 {
13 m_log.Info(txt);
14 }
15
16 public void WriteLine(string txt, params Object[] e)
17 {
18 m_log.Info(String.Format(txt, e));
19 }
20 }
21}
diff --git a/OpenSim/Region/Modules/Python/PythonModule.cs b/OpenSim/Region/Modules/Python/PythonModule.cs
new file mode 100644
index 0000000..142a7df
--- /dev/null
+++ b/OpenSim/Region/Modules/Python/PythonModule.cs
@@ -0,0 +1,48 @@
1using System;
2using System.Collections.Generic;
3using System.Reflection;
4using System.Security.Policy;
5using System.Text;
6using IronPython.Hosting;
7using log4net;
8using Nini.Config;
9using OpenSim.Region.Environment.Interfaces;
10using OpenSim.Region.Environment.Scenes;
11
12namespace OpenSim.Region.Modules.Python
13{
14 class PythonModule : IRegionModule
15 {
16 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
17 private PythonEngine m_python;
18
19 public void Initialise(Scene scene, IConfigSource source)
20 {
21
22 }
23
24 public void PostInitialise()
25 {
26 /*
27 m_log.Info("[PYTHON] Initialising IronPython engine.");
28 m_python = new PythonEngine();
29 m_python.AddToPath(System.Environment.CurrentDirectory + System.IO.Path.DirectorySeparatorChar + "Python");
30 */
31 }
32
33 public void Close()
34 {
35
36 }
37
38 public string Name
39 {
40 get { return "PythonModule"; }
41 }
42
43 public bool IsSharedModule
44 {
45 get { return true; }
46 }
47 }
48}
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index f5de967..9d1cd6c 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -138,8 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
138 } 138 }
139 } 139 }
140 140
141 private static int privateThreadCount = 0;
142// TODO: unused 141// TODO: unused
142// private static int privateThreadCount = 0;
143// private Thread StartScriptLoadUnloadThread() 143// private Thread StartScriptLoadUnloadThread()
144// { 144// {
145// Thread t = new Thread(ScriptLoadUnloadThreadLoop); 145// Thread t = new Thread(ScriptLoadUnloadThreadLoop);
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 4440db1..3ef0ef7 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -1007,10 +1007,16 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
1007 m_log.ErrorFormat("[SPLITSCENE] [LocalUpdatePacket] ScenePresence is missing... ({0})", agentID.ToString()); 1007 m_log.ErrorFormat("[SPLITSCENE] [LocalUpdatePacket] ScenePresence is missing... ({0})", agentID.ToString());
1008 return; 1008 return;
1009 } 1009 }
1010 1010 if (pre.ControllingClient is LLClientView)
1011 if (((LLClientView) pre.ControllingClient).IsActive)
1012 { 1011 {
1013 pre.ControllingClient.OutPacket(packet, throttlePacketType); 1012 if (((LLClientView)pre.ControllingClient).IsActive)
1013 {
1014 ((LLClientView)pre.ControllingClient).OutPacket(packet, throttlePacketType);
1015 }
1016 else
1017 {
1018 PacketPool.Instance.ReturnPacket(packet);
1019 }
1014 } 1020 }
1015 else 1021 else
1016 { 1022 {
diff --git a/ThirdPartyLicenses/IronPython.txt b/ThirdPartyLicenses/IronPython.txt
new file mode 100644
index 0000000..9bcb812
--- /dev/null
+++ b/ThirdPartyLicenses/IronPython.txt
@@ -0,0 +1,28 @@
1This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
21. Definitions
3
4The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the same meaning here as under U.S. copyright law.
5
6A “contribution” is the original software, or any additions or changes to the software.
7
8A “contributor” is any person that distributes its contribution under this license.
9
10“Licensed patents” are a contributor’s patent claims that read directly on its contribution.
112. Grant of Rights
12
13(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
14
15(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
163. Conditions and Limitations
17
18(A) No Trademark License- This license does not grant you rights to use any contributors’ name, logo, or trademarks.
19
20(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
21
22(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
23
24(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
25
26(E) The software is licensed “as-is.” You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
27
28See FAQ.html for answers to frequently asked questions about this license.
diff --git a/bin/IronMath.dll b/bin/IronMath.dll
new file mode 100644
index 0000000..4960cc6
--- /dev/null
+++ b/bin/IronMath.dll
Binary files differ
diff --git a/bin/IronPython.dll b/bin/IronPython.dll
new file mode 100644
index 0000000..2efe7ef
--- /dev/null
+++ b/bin/IronPython.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 474e514..0b84c6b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -863,6 +863,34 @@
863 </Files> 863 </Files>
864 </Project> 864 </Project>
865 865
866
867 <Project name="OpenSim.Region.Modules.Python" path="OpenSim/Region/Modules/Python" type="Library">
868 <Configuration name="Debug">
869 <Options>
870 <OutputPath>../../../../bin/</OutputPath>
871 </Options>
872 </Configuration>
873 <Configuration name="Release">
874 <Options>
875 <OutputPath>../../../../bin/</OutputPath>
876 </Options>
877 </Configuration>
878
879 <ReferencePath>../../../../bin/</ReferencePath>
880 <Reference name="System" localCopy="false"/>
881 <Reference name="libsecondlife.dll"/>
882 <Reference name="IronPython.dll"/>
883 <Reference name="IronMath.dll"/>
884 <Reference name="OpenSim.Framework"/>
885 <Reference name="OpenSim.Data.Base" />
886 <Reference name="OpenSim.Region.Environment"/>
887 <Reference name="Nini.dll" />
888 <Reference name="log4net"/>
889 <Files>
890 <Match pattern="*.cs" recurse="true"/>
891 </Files>
892 </Project>
893
866 <Project name="OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects" path="OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects" type="Library"> 894 <Project name="OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects" path="OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects" type="Library">
867 <Configuration name="Debug"> 895 <Configuration name="Debug">
868 <Options> 896 <Options>