aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2012-08-031-25/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Save membership fee to the database when a group is created.Kevin Cozens2012-08-031-25/+25
| |
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+33
|\ \ | |/
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-311-0/+33
| | | | | | | | constants to the script engine.
* | Merge branch 'master' into careminsterMelanie2012-07-288-5/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-253-0/+3
| | | | | | | | 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-1/+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-32/+39
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Rename "image queues clear" console command to "clear image queues"Justin Clark-Casey (justincc)2012-07-241-12/+6
| | | | | | | | | | There is less justification for this word arrangement (verb after noun) now that command help is categorized. Also removes "image queues show" in favour of existing alias "show image queues".
| * Add information about each column to "show queues" region console command help.Justin Clark-Casey (justincc)2012-07-241-2/+9
| |
| * Extend region console "show queues" command to show already collected time ↵Justin Clark-Casey (justincc)2012-07-241-18/+24
| | | | | | | | since last packeted received by the simulator from a viewer.
* | Merge branch 'avination' into careminsterMelanie2012-07-202-2/+2
|\ \
| * | Fix slow loading of task inventoryMelanie2012-07-192-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-202-3/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-07-192-3/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-191-69/+59
|\ \ \ | |/ / | | / | |/ |/| | | | | | | 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-3/+1
| | | | | | | | | | | | | | 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.
| * Perform other region ready actions even if simulator is configured to leave ↵Justin Clark-Casey (justincc)2012-07-181-26/+19
| | | | | | | | logins disabled on startup.
| * Fix bug where region ready would be triggered a second time if a script was ↵Justin Clark-Casey (justincc)2012-07-181-30/+23
| | | | | | | | | | | | rezzed on a previously script-free region. There is no need to listen for OnRezScript in RegionReadyModule since OnEmptyScriptCompileQueue will only fire if scripts were compiled.
| * Establish EventManager.OnRegionReady event. This will only be triggerred ↵Justin Clark-Casey (justincc)2012-07-181-0/+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-8/+16
| | | | | | | | | | | | 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
| * Only listen to LoginsEnabled event in RegionReadyModule if it has been asked ↵Justin Clark-Casey (justincc)2012-07-181-26/+22
| | | | | | | | to disable logins until all scripts have been compiled
* | Merge branch 'master' into careminsterMelanie2012-07-132-20/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-121-10/+1
| | | | | | | | | | This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor. Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
| * Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-122-10/+0
| | | | | | | | IClientAPI.RemoteEndpoint.
* | Merge branch 'master' into careminsterMelanie2012-07-124-12/+6
|\ \ | |/ | | | | | | | | | | | | 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-114-12/+6
| | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-07-113-2/+60
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init ↵Justin Clark-Casey (justincc)2012-07-071-3/+2
| | | | | | | | is only complete for a particular region at a time
| * minor: Get RegionReady module to shout initialization complete status to ↵Justin Clark-Casey (justincc)2012-07-071-1/+3
| | | | | | | | draw the eye
| * Mantis 6077 trim NPC chat on channel zero.Talun2012-07-061-0/+8
| | | | | | | | | | This patch trims leading and trailing spaces from NPC chat and suppresses the sending of empty chat strings on open chat channel 0.
| * Mantis 6063 osNpcTouch.Talun2012-07-062-0/+49
| | | | | | | | Allow NPCS to touch obects.
* | Merge branch 'master' into careminsterMelanie2012-07-051-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-051-2/+2
| | | | | | | | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high.
* | Merge branch 'master' into careminsterMelanie2012-06-142-9/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-132-9/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-06-061-7/+8
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Ensure closure of bitmap and memory stream with using() statements in ↵Justin Clark-Casey (justincc)2012-06-061-7/+8
| | | | | | | | | | | | WorldViewModule. If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
* | Merge branch 'master' into careminsterMelanie2012-05-271-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * refactor: Rename ConsoleTableRow and ConsoleTableColumn to ↵Justin Clark-Casey (justincc)2012-05-231-6/+6
| | | | | | | | ConsoleDisplayTableRow and ConsoleDisplayTableColumn
| * refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-231-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-132-0/+2
|\ \
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-122-0/+2
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-131-0/+195
|\ \ \ | | |/ | |/|
| * | Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-101-8/+26
| | | | | | | | | | | | | | | | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
| * | Add "attachments" show console command that will show the server's record of ↵Justin Clark-Casey (justincc)2012-05-101-0/+177
| | | | | | | | | | | | | | | | | | which attachments an in-scene avatar has. For debugging purposes.
* | | Merge branch 'master' into careminsterMelanie2012-05-072-3/+4
|\ \ \ | |/ /
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-072-3/+3
| | |
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵dahlia2012-05-061-1/+2
| | | | | | | | | | | | moving NPCs
generated by cgit v1.1 at 2024-12-30 12:12:22 +0000