aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-011-3/+6
|\
| * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar ↵Justin Clark-Casey (justincc)2012-07-311-3/+6
| | | | | | | | | | | | would base its gain calculation on the previous avatar's gain, instead of the original input gain. This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
* | Merge branch 'avination' into careminsterMelanie2012-07-292-1/+4
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Bump number of URLs to 15000 per regionMelanie2012-07-291-1/+1
| | |
| * | Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
| | | | | | | | | | | | | | | | | | present on the command line for compatibility, but is ignored. Avination's IAR operations are administratively done and the staff doesn't have the passwords of the users.
* | | Merge branch 'master' into careminsterMelanie2012-07-288-12/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | When copying items, copy the item description field instead of the asset ↵Justin Clark-Casey (justincc)2012-07-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | description field. If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes. Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107 I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc.
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-252-0/+2
| | | | | | | | | | | | with other monitoring code from OpenSim.Framework
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-254-4/+4
| | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-6/+1
| | | | | | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
* | | Merge branch 'master' into careminsterMelanie2012-07-251-7/+44
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| | | | | | | | | | | | It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails.
| * | extend regression TestRezScriptedAttachmentFromInventory() to check actual ↵Justin Clark-Casey (justincc)2012-07-241-3/+19
| | | | | | | | | | | | start of script rather than just the script status reported by SOG.ContainsScripts()
| * | extend regression TestDetachScriptedAttachementToInventory() to check ↵Justin Clark-Casey (justincc)2012-07-241-3/+25
| | | | | | | | | | | | correct running status on a re-rezzed attachment
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+59
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'avination' into careminsterMelanie2012-07-231-29/+58
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+58
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'master' into careminsterMelanie2012-07-232-1/+162
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-201-1/+1
| | | | | | | | | | | | attempting to fix a mono compile error.
| * | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵Robert Adams2012-07-202-1/+162
| | | | | | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance).
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | |/ /
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'avination' into careminsterMelanie2012-07-201-4/+7
|\ \ \ | | |/ | |/|
| * | Fix slow loading of task inventoryMelanie2012-07-191-4/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-201-10/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Comment out OnIncomingInstantMessage and OnInstantMessage handlers in ↵Justin Clark-Casey (justincc)2012-07-191-10/+10
| | | | | | | | | | | | GroupsModule, since these led to a private blank method
* | | Merge branch 'master' into careminsterMelanie2012-07-195-33/+24
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are ↵Justin Clark-Casey (justincc)2012-07-191-5/+5
| | | | | | | | | | | | | | enabled or disabled at any point, not just during initial startup. This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled and was affected by a bug where it would never fire if the region started with logins disabled.
| * Establish EventManager.OnRegionReady event. This will only be triggerred ↵Justin Clark-Casey (justincc)2012-07-181-8/+2
| | | | | | | | | | | | once when the region is ready. Switch MapImageServiceModule to use this.
| * Pass entire scene object in OnLoginsEnabled event rather than just the ↵Justin Clark-Casey (justincc)2012-07-181-11/+2
| | | | | | | | | | | | region name. This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
| * Fix regression where llGiveInventory() had stopped asking non-owner ↵Justin Clark-Casey (justincc)2012-07-172-9/+14
| | | | | | | | | | | | | | | | | | receivers to accept/decline. This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog. This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway. This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well Fixes http://opensimulator.org/mantis/view.php?id=6089
| * Restore update of inventory item on derez/logout. This is necessary to ↵Justin Clark-Casey (justincc)2012-07-171-1/+6
| | | | | | | | | | | | | | update the name if this has been changed whilst attached. Note, this behaviour appears to be at variance with the ll grid as of Tues 17 July 2012, testing with viewer 3.2.1. The item name in inventory does not change either at the point of detach or after a relog.
| * Stop sending the viewer an inventory create message if a known attachment ↵Justin Clark-Casey (justincc)2012-07-171-4/+1
| | | | | | | | | | | | | | item is updated. This doesn't seem to make any sense and probably stems from a period when this code was directly involved in attaching objects directly from the scene. This message is already being sent by InventoryAccessModule code instead.
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make https work in the poll service managerMelanie2012-07-151-2/+2
| | |
| * | Fix a double parenthesis typoMelanie2012-07-151-1/+1
| | |
| * | Set up https to work like http does in the poll handlerMelanie2012-07-151-3/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-161-7/+14
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | When generating a Warp3D texture, set the detailTexture[i] variable on ↵Justin Clark-Casey (justincc)2012-07-141-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | resize from the JPEG2000 original rather than only saving it to disk. This appears to be the cause of the warp 3d exception seen when starting a new region for the first time. Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk. Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
* | | Merge branch 'master' into careminsterMelanie2012-07-132-17/+24
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| | |
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-131-1/+1
| | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
| * | Don't cache regions data on the other unused LocalGridServiceConnector that ↵Justin Clark-Casey (justincc)2012-07-133-17/+25
| | | | | | | | | | | | | | | | | | the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
* | | Merge branch 'master' into careminsterMelanie2012-07-124-25/+156
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-112-3/+1
| | | | | | | | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
| * | Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-111-1/+2
| | | | | | | | | | | | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
| * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-20/+127
| | | | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
| * | Add regression TestRezScriptedAttachmentsFromInventory() though this ↵Justin Clark-Casey (justincc)2012-07-111-1/+26
| | | | | | | | | | | | currently only checks for the presence of script items, not for started scripts
* | | Merge branch 'avination' into careminsterMelanie2012-07-113-279/+383
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs