aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-112-11/+20
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * One more module converted: TreePopulator.Diva Canto2012-11-092-11/+20
| |
* | Merge branch 'master' into careminsterMelanie2012-10-302-2/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * shuffling code around so that the interface for ISoundModule.SendSound() ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | specifies a UUID rather than a string
| * moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-291-2/+5
| |
| * Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-291-0/+11
| | | | | | | | | | | | This was because we were removing by circuitcode where NPCs have no code. Now removing by agent ID instead. This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
* | Merge branch 'master' into careminsterMelanie2012-10-264-7/+14
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-253-7/+11
| | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
| * Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)2012-10-241-0/+3
| | | | | | | | | | | | filename to save already exists, rather than exception throwing. Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
* | Merge branch 'master' into careminsterMelanie2012-10-203-8/+107
|\ \ | |/
| * Relocate temporary debug message for sending group IMs to online members ↵Justin Clark-Casey (justincc)2012-10-201-4/+12
| | | | | | | | | | | | only so that we can add ms it takes to send. This is chiefly to assess how long it may still take to send messages to such filtered groups.
| * Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc ↵Justin Clark-Casey (justincc)2012-10-201-7/+69
| | | | | | | | | | | | | | | | | | | | groups. This retrieves and caches information from the PresenceService to only send messages to online users. This is reported to much improve performance for large groups where most users are offline. Cache is 20 seconds to balance requests against users not receiving messages until cache updates. This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service. However, I'm not convinced that this PresenceService approach is actually better. Needs more thought.
| * Fix build break from commit e469879Justin Clark-Casey (justincc)2012-10-201-1/+1
| |
| * Add "debug groups verbose <true|false>" region console commandJustin Clark-Casey (justincc)2012-10-191-0/+29
| | | | | | | | This allows one to turn on super-verbose groups debug logging on and off whilst the region is in operation.
| * minor: Increase attachment name field from 36 to 50 chars in "attachments ↵Justin Clark-Casey (justincc)2012-10-191-1/+1
| | | | | | | | show" report
* | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| * Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-305-5/+1
| | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-305-1/+5
| | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | Merge branch 'avination' into careminsterMelanie2012-09-272-1/+10
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-242-1/+10
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* | | Merge branch 'master' into careminsterMelanie2012-09-242-370/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Don't fail to create an IRC nick if nick randomization is disabled in the ↵Justin Clark-Casey (justincc)2012-09-201-3/+3
| | | | | | | | | | | | | | | | | | | | | IRC module. Patch from http://opensimulator.org/mantis/view.php?id=6293 Thanks Starflower.
| * | Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-367/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-171-0/+31
|\ \ \ | |/ /
| * | Implementing ability to register script constants and invocations on a ↵SignpostMarv2012-09-171-0/+31
| | | | | | | | | | | | region module automatically
* | | Merge branch 'master' into careminsterMelanie2012-09-171-9/+9
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | script invocations cannot have void return typeSignpostMarv2012-09-171-9/+9
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-163-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-1/+1
| | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | Allow an incoming identifier to be specified for a JsonStore.Mic Bowman2012-09-112-8/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-092-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵SignpostMarv2012-09-082-2/+2
| | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
* | | Merge branch 'master' into careminsterMelanie2012-08-311-1/+1
|\ \ \ | |/ /
| * | Type.Type is RuntimeTypeSignpostMarv2012-08-311-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-311-10/+38
|\ \ \ | |/ /
| * | formattingSignpostMarv2012-08-311-5/+5
| | |
| * | adding support for static method script invocationsSignpostMarv2012-08-311-0/+15
| | |
| * | moving assignment to new line to make next commit easier to read in diffsSignpostMarv2012-08-311-1/+2
| | |
| * | using specific type instead of varSignpostMarv2012-08-311-1/+1
| | |
| * | formattingSignpostMarv2012-08-311-1/+1
| | |
| * | formattingSignpostMarv2012-08-311-2/+1
| | |
| * | adding support for finding static methodsSignpostMarv2012-08-311-3/+9
| | |
| * | assign binding flags to variableSignpostMarv2012-08-311-1/+3
| | |
| * | no need to assign result to GetMethodInfoFromTypeSignpostMarv2012-08-311-3/+1
| | |
| * | changing to use Type argument instead of objectSignpostMarv2012-08-311-3/+3
| | |
| * | moving code that will be common into private static methodSignpostMarv2012-08-311-1/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-232-4/+6
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-202-0/+10
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
| * Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-151-3/+38
| | | | | | | | permissions and add support for this (incomplete!) to LSL