aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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!
* Fix slow loading of task inventoryMelanie2012-07-191-4/+7
|
* 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
| * | Reinstate parallel fetching of residents and remove a left over return from ↵Melanie2012-07-081-5/+7
| | | | | | | | | | | | debugging
| * | Revamp map block sending to eliminate overload of the grid server connectionMelanie2012-07-082-98/+204
| | | | | | | | | | | | and the sim's http client
| * | Instead of sending 20 records in 2 packets, send just one as we intended in ↵Melanie2012-07-081-1/+1
| | | | | | | | | | | | the first place.
| * | Address map lag issue seen with non-avination viewersMelanie2012-07-082-261/+257
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-114-105/+109
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| * | When an attachment is detached to inv or derezzed, stop the scripts, update ↵Justin Clark-Casey (justincc)2012-07-101-6/+14
| | | | | | | | | | | | | | | | | | the known item with script state still in the script engine and then remove the scripts. This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
| * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-092-1/+40
| | | | | | | | | | | | | | | | | | This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar. This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar. Recording HashSet is null if there are no sitting avatars in order to save memory.
| * | Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xmlJustin Clark-Casey (justincc)2012-07-071-1/+0
| | | | | | | | | | | | | | | This was causing 2 copies of the module to be created for each scene. Probably no bad consequences other than a small waste of memory (both for the module and for the warp3D renderer it loaded)
| * | minor: Make WORLD MAP category log lines consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
| | |
| * | minor: Remove some wrong comments in attachments regression testsJustin Clark-Casey (justincc)2012-07-061-2/+0
| | |
| * | Add assert to attachment regression tests to check that number of objects in ↵Justin Clark-Casey (justincc)2012-07-061-0/+14
| | | | | | | | | | | | the scene graph
| * | refactor: extract method UpdateUserInventoryWithAttachment() from ↵Justin Clark-Casey (justincc)2012-07-061-29/+38
| | | | | | | | | | | | AttachObject() for better code comprehension
* | | Merge branch 'avination' into careminsterMelanie2012-07-063-9/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-051-4/+4
| | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before.
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-2/+2
| | | | | | | | | | | | it's timeout
| * | Remove spammy debugMelanie2012-06-291-1/+1
| | |
| * | stop chat being sent to child avs again.Melanie2012-06-291-3/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-053-3/+37
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | porting console commands from raw2sculpt 3.2SignpostMarv2012-07-051-0/+34
| | |
| * | Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-052-3/+3
| | | | | | | | | | | | | | | | | | | | | 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-07-012-26/+1
|\ \ \ | |/ /
| * | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-302-26/+1
| | | | | | | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | | Merge branch 'master' into careminsterMelanie2012-06-292-53/+46
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-282-40/+45
| | | | | | | | | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
| * | Rather than iterating through all SOGs in the scene looking for the one that ↵Justin Clark-Casey (justincc)2012-06-281-24/+17
| | | | | | | | | | | | matches out fromItemID on detach, go through the agent's attachment sog list instead.
| * | Remove code that tried to delete an attachment back to inventory if ↵Justin Clark-Casey (justincc)2012-06-281-6/+1
| | | | | | | | | | | | | | | | | | | | | RezSingleAttachmentFromInventoryInternal() returned null. null would only ever be returned if the item couldn't be located within inventory and this would happen immediately. In this case, derezzing wouldn't work anyway since there is no item to derez.
* | | Merge branch 'avination' into careminsterMelanie2012-06-293-10/+23
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Fix llRegionSayTo the right wayMelanie2012-06-282-9/+21
| | |
| * | Comment out a spammy message that will spew 4 lines for each request to aMelanie2012-06-271-1/+2
| | | | | | | | | | | | nonexistent URL for http-in
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-282-69/+51
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
generated by cgit v1.1 at 2024-12-24 20:27:40 +0000