aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authorMW2007-04-04 11:06:39 +0000
committerMW2007-04-04 11:06:39 +0000
commita70ef1c2cb90a5b40a2e19acb81cf7310c140663 (patch)
treec7b9cdf97a243bace8711e70eed49e811af7f12d /OpenSim.RegionServer/world/World.cs
parentFinished initial sim<>Grid login (kinda) (diff)
downloadopensim-SC-a70ef1c2cb90a5b40a2e19acb81cf7310c140663.zip
opensim-SC-a70ef1c2cb90a5b40a2e19acb81cf7310c140663.tar.gz
opensim-SC-a70ef1c2cb90a5b40a2e19acb81cf7310c140663.tar.bz2
opensim-SC-a70ef1c2cb90a5b40a2e19acb81cf7310c140663.tar.xz
Started to clean up/ rewrite Primitive class , currently the new version is called Primitive2 and not used, but once it is complete then it will replace the old version.
Diffstat (limited to 'OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim.RegionServer/world/World.cs32
1 files changed, 8 insertions, 24 deletions
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