aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-20 18:38:20 +0000
committerJeff Ames2008-02-20 18:38:20 +0000
commita8cfbbe963529728acbab4d9936cb89af380d1ac (patch)
tree16a72fba3d15556f6702127e7cfb98aa9fb9cf81 /OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs
parentFix exception when reading OpenSim.ini file. (diff)
downloadopensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.zip
opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.gz
opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.bz2
opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.xz
Minor cleanup.
Diffstat (limited to 'OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs')
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs
index e6c1678..8c4506d 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/AppDomainManager.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
@@ -105,7 +105,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
105 105
106 Console.WriteLine("Scripts loaded in this Appdomain: " + currentAD.ScriptsLoaded); 106 Console.WriteLine("Scripts loaded in this Appdomain: " + currentAD.ScriptsLoaded);
107 return currentAD; 107 return currentAD;
108 } // lock 108 }
109 } 109 }
110 110
111 private int AppDomainNameCount; 111 private int AppDomainNameCount;
@@ -169,11 +169,10 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
169#endif 169#endif
170 } 170 }
171 } 171 }
172 } // foreach 172 }
173 } // lock 173 }
174 } 174 }
175 175
176
177 public LSL_BaseClass LoadScript(string FileName) 176 public LSL_BaseClass LoadScript(string FileName)
178 { 177 {
179 // Find next available AppDomain to put it in 178 // Find next available AppDomain to put it in
@@ -189,7 +188,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
189 return mbrt; 188 return mbrt;
190 } 189 }
191 190
192
193 /// <summary> 191 /// <summary>
194 /// Increase "dead script" counter for an AppDomain 192 /// Increase "dead script" counter for an AppDomain
195 /// </summary> 193 /// </summary>
@@ -217,8 +215,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
217 ads.ScriptsWaitingUnload++; 215 ads.ScriptsWaitingUnload++;
218 break; 216 break;
219 } 217 }
220 } // foreach 218 }
221 } // lock 219 }
222 220
223 UnloadAppDomains(); // Outsite lock, has its own GetLock 221 UnloadAppDomains(); // Outsite lock, has its own GetLock
224 } 222 }