aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fix a typoMelanie2012-08-181-1/+1
| |
* | Remove XML debug spam from vivox voiceMelanie2012-08-161-12/+12
| |
* | 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
* | Remove NPC debug spamMelanie2012-08-141-7/+7
| |
* | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-08-142-41/+65
|\ \ | | | | | | | | | avination
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-33/+29
| |\ \ | | |/
| | * Prevent race conditions when one thread removes an NPC SP before another ↵Justin Clark-Casey (justincc)2012-08-141-34/+30
| | | | | | | | | | | | thread has retreived it after checking whether the NPC exists.
| * | Merge branch 'master' into careminsterMelanie2012-08-141-8/+36
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| | * Perform ownership transfer and permission propagation as well as neededMelanie2012-08-141-0/+28
| | | | | | | | | | | | updates on the new temp attachment.
| | * Move inititalization to RegionLoaded to avoid a module loading order issueMelanie2012-08-141-8/+8
| | |
* | | Removed more spammy NPC crapMelanie2012-08-141-1/+1
| | |
* | | Comment spammy debugMelanie2012-08-141-3/+3
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-141-0/+126
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Implement the temp attachments. UNTESTEDMelanie2012-08-141-0/+44
| |
| * Add the skeleton for the temp attachments moduleMelanie2012-08-141-0/+82
| |
generated by cgit v1.1 at 2024-12-21 05:51:07 +0000