diff options
Diffstat (limited to 'OpenSim.RegionServer/world')
-rw-r--r-- | OpenSim.RegionServer/world/Entity.cs | 4 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 32 |
2 files changed, 10 insertions, 26 deletions
diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim.RegionServer/world/Entity.cs index 424d395..b59d200 100644 --- a/OpenSim.RegionServer/world/Entity.cs +++ b/OpenSim.RegionServer/world/Entity.cs | |||
@@ -23,11 +23,11 @@ namespace OpenSim.world | |||
23 | get { return m_name; } | 23 | get { return m_name; } |
24 | } | 24 | } |
25 | 25 | ||
26 | private LLVector3 m_pos; | 26 | protected LLVector3 m_pos; |
27 | protected PhysicsActor _physActor; | 27 | protected PhysicsActor _physActor; |
28 | protected World m_world; | 28 | protected World m_world; |
29 | 29 | ||
30 | public LLVector3 Pos | 30 | public virtual LLVector3 Pos |
31 | { | 31 | { |
32 | get | 32 | get |
33 | { | 33 | { |
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 0799e38..b6f71aa 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs | |||
@@ -76,32 +76,16 @@ namespace OpenSim.world | |||
76 | scriptend = scriptData.LastIndexOf("</Script>"); | 76 | scriptend = scriptData.LastIndexOf("</Script>"); |
77 | substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8); | 77 | substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8); |
78 | substring = substring.Trim(); | 78 | substring = substring.Trim(); |
79 | Console.WriteLine("searching for script to add: " + substring); | 79 | //Console.WriteLine("searching for script to add: " + substring); |
80 | 80 | ||
81 | ScriptFactory scriptFactory; | 81 | ScriptFactory scriptFactory; |
82 | 82 | ||
83 | if (this.m_scripts.TryGetValue(substring, out scriptFactory )) | 83 | if (this.m_scripts.TryGetValue(substring, out scriptFactory)) |
84 | { | 84 | { |
85 | Console.WriteLine("added script"); | 85 | //Console.WriteLine("added script"); |
86 | |||
87 | |||
88 | |||
89 | this.AddScript(entity, scriptFactory()); | 86 | this.AddScript(entity, scriptFactory()); |
90 | } | 87 | } |
91 | /*string delimStr = " "; | 88 | |
92 | char[] delimiter = delimStr.ToCharArray(); | ||
93 | string[] line; | ||
94 | line = scriptData.Split(delimiter); | ||
95 | if (line.Length > 1) | ||
96 | { | ||
97 | if (line[0] == "script:") | ||
98 | { | ||
99 | if (this.m_scripts.ContainsKey(line[1])) | ||
100 | { | ||
101 | this.AddScript(entity, this.m_scripts[line[1]]); | ||
102 | } | ||
103 | } | ||
104 | }*/ | ||
105 | } | 89 | } |
106 | 90 | ||
107 | public InventoryCache InventoryCache | 91 | public InventoryCache InventoryCache |
@@ -566,8 +550,8 @@ namespace OpenSim.world | |||
566 | { | 550 | { |
567 | this.m_scripts.Add("FollowRandomAvatar", delegate() | 551 | this.m_scripts.Add("FollowRandomAvatar", delegate() |
568 | { | 552 | { |
569 | return new FollowRandomAvatar(); | 553 | return new FollowRandomAvatar(); |
570 | }); | 554 | }); |
571 | } | 555 | } |
572 | 556 | ||
573 | 557 | ||