aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs21
-rw-r--r--bin/OpenSim.ini.example17
3 files changed, 38 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f053911..ae942f9 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -396,18 +396,20 @@ namespace OpenSim
396 scene.SnmpService.BootInfo("Grid Registration done", scene); 396 scene.SnmpService.BootInfo("Grid Registration done", scene);
397 } 397 }
398 398
399 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
400 scene.EventManager.TriggerParcelPrimCountUpdate();
401
399 // We need to do this after we've initialized the 402 // We need to do this after we've initialized the
400 // scripting engines. 403 // scripting engines.
401 scene.CreateScriptInstances(); 404 scene.CreateScriptInstances();
402 405
403 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
404 scene.EventManager.TriggerParcelPrimCountUpdate();
405
406 if (scene.SnmpService != null) 406 if (scene.SnmpService != null)
407 { 407 {
408 scene.SnmpService.BootInfo("ScriptEngine started", scene); 408 scene.SnmpService.BootInfo("ScriptEngine started", scene);
409 } 409 }
410 410
411=======
412>>>>>>> master:OpenSim/Region/Application/OpenSimBase.cs
411 m_sceneManager.Add(scene); 413 m_sceneManager.Add(scene);
412 414
413 if (m_autoCreateClientStack) 415 if (m_autoCreateClientStack)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c3cdca8..5be71df 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -31,6 +31,7 @@ using System.IO;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Collections; 32using System.Collections;
33using System.Reflection; 33using System.Reflection;
34using System.Threading;
34using OpenMetaverse; 35using OpenMetaverse;
35using log4net; 36using log4net;
36using OpenSim.Framework; 37using OpenSim.Framework;
@@ -208,6 +209,7 @@ namespace OpenSim.Region.Framework.Scenes
208 if ((int)InventoryType.LSL == item.InvType) 209 if ((int)InventoryType.LSL == item.InvType)
209 { 210 {
210 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 211 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
212 Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug
211 } 213 }
212 } 214 }
213 } 215 }
@@ -268,7 +270,7 @@ namespace OpenSim.Region.Framework.Scenes
268 // m_log.InfoFormat( 270 // m_log.InfoFormat(
269 // "[PRIM INVENTORY]: " + 271 // "[PRIM INVENTORY]: " +
270 // "Starting script {0}, {1} in prim {2}, {3}", 272 // "Starting script {0}, {1} in prim {2}, {3}",
271 // item.Name, item.ItemID, Name, UUID); 273 // item.Name, item.ItemID, m_part.Name, m_part.UUID);
272 274
273 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) 275 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
274 { 276 {
@@ -308,6 +310,7 @@ namespace OpenSim.Region.Framework.Scenes
308 } 310 }
309 else 311 else
310 { 312 {
313<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
311 if (m_part.ParentGroup.m_savedScriptState != null) 314 if (m_part.ParentGroup.m_savedScriptState != null)
312 RestoreSavedScriptState(item.OldItemID, item.ItemID); 315 RestoreSavedScriptState(item.OldItemID, item.ItemID);
313 316
@@ -324,6 +327,22 @@ namespace OpenSim.Region.Framework.Scenes
324 StoreScriptErrors(item.ItemID, null); 327 StoreScriptErrors(item.ItemID, null);
325 m_part.ParentGroup.AddActiveScriptCount(1); 328 m_part.ParentGroup.AddActiveScriptCount(1);
326 m_part.ScheduleFullUpdate(); 329 m_part.ScheduleFullUpdate();
330=======
331 lock (m_items)
332 {
333 if (m_part.ParentGroup.m_savedScriptState != null)
334 RestoreSavedScriptState(item.OldItemID, item.ItemID);
335
336 m_items[item.ItemID].PermsMask = 0;
337 m_items[item.ItemID].PermsGranter = UUID.Zero;
338
339 string script = Utils.BytesToString(asset.Data);
340 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
341 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
342 m_part.ParentGroup.AddActiveScriptCount(1);
343 m_part.ScheduleFullUpdate();
344 }
345>>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
327 } 346 }
328 } 347 }
329 } 348 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7846d71..c21dc98 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -600,21 +600,19 @@
600 ; Set this to a nonzero value to have remote admin use a different port 600 ; Set this to a nonzero value to have remote admin use a different port
601 port = 0 601 port = 0
602 602
603 ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
603 access_password = unknown 604 access_password = unknown
604 605
605 ; set this variable to true if you want the create_region XmlRpc 606 ; set this variable to true if you want the create_region XmlRpc
606 ; call to unconditionally enable voice on all parcels for a newly 607 ; call to unconditionally enable voice on all parcels for a newly
607 ; created region [default: false] 608 ; created region [default: false]
608
609 create_region_enable_voice = false 609 create_region_enable_voice = false
610 610
611 ; set this variable to false if you want the create_region XmlRpc 611 ; set this variable to false if you want the create_region XmlRpc
612 ; call to create all regions as private per default (can be 612 ; call to create all regions as private per default (can be
613 ; overridden in the XmlRpc call) [default: true] 613 ; overridden in the XmlRpc call) [default: true]
614
615 create_region_public = false 614 create_region_public = false
616 615
617
618 ; the create_region XmlRpc call uses region_file_template to generate 616 ; the create_region XmlRpc call uses region_file_template to generate
619 ; the file name of newly create regions (if they are created 617 ; the file name of newly create regions (if they are created
620 ; persistent). the parameter available are: 618 ; persistent). the parameter available are:
@@ -623,7 +621,6 @@
623 ; {2} - region UUID 621 ; {2} - region UUID
624 ; {3} - region port 622 ; {3} - region port
625 ; {4} - region name with " ", ":", "/" mapped to "_" 623 ; {4} - region name with " ", ":", "/" mapped to "_"
626
627 region_file_template = "{0}x{1}-{2}.xml" 624 region_file_template = "{0}x{1}-{2}.xml"
628 625
629 ; we can limit the number of regions that XmlRpcCreateRegion will 626 ; we can limit the number of regions that XmlRpcCreateRegion will
@@ -638,6 +635,18 @@
638 ; if this parameter is not specified but enabled = true, all methods will be available 635 ; if this parameter is not specified but enabled = true, all methods will be available
639 enabled_methods = all 636 enabled_methods = all
640 637
638 ; specify the default appearance for an avatar created through the remote admin interface
639 ; This will only take effect is the file specified by the default_appearance setting below exists
640 ;default_male = Default Male
641 ;default_female = Default Female
642
643 ; update appearance copies inventory items and wearables of default avatars. if this value is false
644 ; (default), just worn assets are copied to the Clothes folder; if true, all Clothes and Bodyparts
645 ; subfolders are copied. the receiver will wear the same items the default avatar did wear.
646 ;copy_folders = false
647
648 ; path to default appearance XML file that specifies the look of the default avatars
649 ;default_appearance = default_appearance.xml
641 650
642[RestPlugins] 651[RestPlugins]
643 ; Change this to true to enable REST Plugins. This must be true if you wish to use 652 ; Change this to true to enable REST Plugins. This must be true if you wish to use