aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-08-31 12:03:06 +0100
committerUbitUmarov2016-08-31 12:03:06 +0100
commit96ee7e4c2c7f94bd77be8a2206a38d3c0d74ec5e (patch)
tree49b48f87b03187cf6c0f5ddc8826efbecb002dad
parentXengine: coment out tests too dependent on precise characters and lines gener... (diff)
downloadopensim-SC-96ee7e4c2c7f94bd77be8a2206a38d3c0d74ec5e.zip
opensim-SC-96ee7e4c2c7f94bd77be8a2206a38d3c0d74ec5e.tar.gz
opensim-SC-96ee7e4c2c7f94bd77be8a2206a38d3c0d74ec5e.tar.bz2
opensim-SC-96ee7e4c2c7f94bd77be8a2206a38d3c0d74ec5e.tar.xz
Xengine: if option AppDomainLoading = true, create script domains for each SOG (like already done for attachments) and not per script. This should reduce number of domains without excessive problem of deleted scripts still loaded.
-rwxr-xr-xOpenSim/Region/ScriptEngine/XEngine/XEngine.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f42b5ad..a9e6132 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1289,10 +1289,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1289 if ((!m_Scripts.ContainsKey(itemID)) || 1289 if ((!m_Scripts.ContainsKey(itemID)) ||
1290 (m_Scripts[itemID].AssetID != assetID)) 1290 (m_Scripts[itemID].AssetID != assetID))
1291 { 1291 {
1292 UUID appDomain = assetID; 1292// UUID appDomain = assetID;
1293 1293
1294 if (part.ParentGroup.IsAttachment) 1294// if (part.ParentGroup.IsAttachment)
1295 appDomain = part.ParentGroup.RootPart.UUID; 1295// appDomain = part.ParentGroup.RootPart.UUID;
1296 UUID appDomain = part.ParentGroup.RootPart.UUID;
1296 1297
1297 if (!m_AppDomains.ContainsKey(appDomain)) 1298 if (!m_AppDomains.ContainsKey(appDomain))
1298 { 1299 {