aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2008-02-25 11:29:24 +0000
committerTedd Hansen2008-02-25 11:29:24 +0000
commit66cc8f99f67c2fd4679a4501bee6f008d80eae69 (patch)
tree20137df6af2615c4d02cd79780995e5fe3be2797 /OpenSim
parent* Message Server Linkages (still not ready for use so don't start it yet) (diff)
downloadopensim-SC_OLD-66cc8f99f67c2fd4679a4501bee6f008d80eae69.zip
opensim-SC_OLD-66cc8f99f67c2fd4679a4501bee6f008d80eae69.tar.gz
opensim-SC_OLD-66cc8f99f67c2fd4679a4501bee6f008d80eae69.tar.bz2
opensim-SC_OLD-66cc8f99f67c2fd4679a4501bee6f008d80eae69.tar.xz
I'm the stupidest stupid in the whole world. :)
Fixed a bug in new Prim where I actually ADDED new values to old values instead of directly assigning them... Now that was a waste of time! :P
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs38
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs7
2 files changed, 23 insertions, 22 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index 08f6009..27b3050 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -105,6 +105,18 @@ namespace OpenSim.Region.ScriptEngine.Common
105 } 105 }
106 private void Save() 106 private void Save()
107 { 107 {
108 if (Position.x > 255)
109 Position.x = 255;
110 if (Position.x < 0)
111 Position.x = 0;
112 if (Position.y > 255)
113 Position.y = 255;
114 if (Position.y < 0)
115 Position.y = 0;
116 if (Position.z > 768)
117 Position.z = 768;
118 if (Position.z < 0)
119 Position.z = 0;
108 prim.OSSL.llSetPos(Position); 120 prim.OSSL.llSetPos(Position);
109 } 121 }
110 122
@@ -118,11 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Common
118 set 130 set
119 { 131 {
120 Load(); 132 Load();
121 Position.x += value; 133 Position.x = value;
122 if (Position.x > 255)
123 Position.x = 255;
124 if (Position.x < 0)
125 Position.x = 0;
126 Save(); 134 Save();
127 } 135 }
128 } 136 }
@@ -136,11 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Common
136 set 144 set
137 { 145 {
138 Load(); 146 Load();
139 Position.y += value; 147 Position.y = value;
140 if (Position.y > 255)
141 Position.y = 255;
142 if (Position.y < 0)
143 Position.y = 0;
144 Save(); 148 Save();
145 } 149 }
146 } 150 }
@@ -154,11 +158,7 @@ namespace OpenSim.Region.ScriptEngine.Common
154 set 158 set
155 { 159 {
156 Load(); 160 Load();
157 Position.z += value; 161 Position.z = value;
158 if (Position.z > 255)
159 Position.z = 255;
160 if (Position.z < 0)
161 Position.z = 0;
162 Save(); 162 Save();
163 } 163 }
164 } 164 }
@@ -191,7 +191,7 @@ namespace OpenSim.Region.ScriptEngine.Common
191 set 191 set
192 { 192 {
193 Load(); 193 Load();
194 Rotation.x += value; 194 Rotation.x = value;
195 Save(); 195 Save();
196 } 196 }
197 } 197 }
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Common
205 set 205 set
206 { 206 {
207 Load(); 207 Load();
208 Rotation.y += value; 208 Rotation.y = value;
209 Save(); 209 Save();
210 } 210 }
211 } 211 }
@@ -219,7 +219,7 @@ namespace OpenSim.Region.ScriptEngine.Common
219 set 219 set
220 { 220 {
221 Load(); 221 Load();
222 Rotation.z += value; 222 Rotation.z = value;
223 Save(); 223 Save();
224 } 224 }
225 } 225 }
@@ -233,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Common
233 set 233 set
234 { 234 {
235 Load(); 235 Load();
236 Rotation.s += value; 236 Rotation.s = value;
237 Save(); 237 Save();
238 } 238 }
239 } 239 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
index 23dec6a..cac3256 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
@@ -139,12 +139,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
139 // Construct and initialize settings for a second AppDomain. 139 // Construct and initialize settings for a second AppDomain.
140 AppDomainSetup ads = new AppDomainSetup(); 140 AppDomainSetup ads = new AppDomainSetup();
141 ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory; 141 ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory;
142 ads.DisallowBindingRedirects = false; 142 ads.DisallowBindingRedirects = true;
143 ads.DisallowCodeDownload = true; 143 ads.DisallowCodeDownload = true;
144 ads.LoaderOptimization = LoaderOptimization.MultiDomain; // Sounds good ;) 144 ads.LoaderOptimization = LoaderOptimization.MultiDomainHost;
145 ads.ShadowCopyFiles = "true"; // Enabled shadowing 145 ads.ShadowCopyFiles = "false"; // Disable shadowing
146 ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; 146 ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
147 147
148
148 AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads); 149 AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads);
149 m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " + 150 m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " +
150 AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString()); 151 AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString());