aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-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
6 files changed, 108 insertions, 4 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);