aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-281-2/+2
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-2/+2
| | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
* | Intermediate commit. Sill errors.Melanie2014-01-051-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * Fix issue with editing notes for other avatarsBlueWall2013-12-161-2/+2
| |
| * Committing the Avination Scene Presence and related texture codeMelanie2013-12-112-90/+474
| | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-67/+0
| | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
* | Merge branch 'master' into careminsterMelanie2013-12-071-0/+67
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+67
| |
* | Merge branch 'master' into careminsterMelanie2013-11-232-3/+3
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * minor: Use default(UUID) in rez attachment failure error logging rather than ↵Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | | | | | | | (UUID)null Patch from http://opensimulator.org/mantis/view.php?id=6843 Thanks Kira.
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'master' into careminsterMelanie2013-11-031-2/+10
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * * Refactorteravus2013-10-071-2/+2
| | | | | | | | * Break out common BasicDOSProtector code into separate class.
| * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-071-2/+10
| | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-061-1/+2
|\ \ | | | | | | | | | careminster
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
* | | Merge branch 'master' into careminsterMelanie2013-10-061-0/+36
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, ↵Diva Canto2013-10-041-0/+37
| | | | | | | | shout-range, at the request of Singularity dev Liru-Dargon
* | Merge branch 'master' into careminsterMelanie2013-10-045-7/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-272-2/+2
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-1/+17
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
| * minor: Recomment out log message uncommented in previous cbdfe969Justin Clark-Casey (justincc)2013-09-211-4/+4
| |
| * When giving items between avatars in different simulators, only add the item ↵Oren Hurvitz2013-09-211-9/+44
| | | | | | | | | | | | to the receiving avatar's inventory once. When a user gives an item, the user's client sends an InventoryOffered IM message to its simulator. This adds the item to the receiver's inventory. If the receiver isn't in the same simulator then XMLRPC is used to forward the IM to the correct simulator. The bug was that the receiving simulator handled the message by calling OnInstantMessage() again, which added a second copy of the item to the inventory. Instead, the receiving simulator should only notify the avatar that the item was offered.
| * minor: Add prefix to log message in LureModuleJustin Clark-Casey (justincc)2013-09-211-1/+1
| |
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-0/+2
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-08-241-0/+2
| | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
| * | Make attachment state load work againMelanie2013-08-011-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-09-072-18/+17
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Remove test that gives issue on Windows, just let the try/catch do the work.BlueWall2013-09-021-5/+1
| | |
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-021-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
* | | Merge branch 'master' into careminsterMelanie2013-09-012-17/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Profiles: Clean up some log entries caused when visiting HG avatar is using ↵BlueWall2013-08-291-16/+26
| | | | | | | | | | | | legacy profiles
| * | Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
| | | | | | | | | | | | printed the error message and not the call stack.
* | | Merge branch 'master' into careminsterMelanie2013-08-173-38/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * | Remove mono compiler warnings from UserProfilesModuleJustin Clark-Casey (justincc)2013-08-171-19/+16
| | |
| * | minor: remove mono compiler warning from AttachmentsModuleJustin Clark-Casey (justincc)2013-08-171-2/+1
| | |
| * | Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() ↵Justin Clark-Casey (justincc)2013-08-171-2/+2
| | | | | | | | | | | | | | | | | | regression test for v2 transfers. Also adjusts names of teleport setup helpers in EntityTransferHelpers
| * | refactor: Make ↵Justin Clark-Casey (justincc)2013-08-161-1/+1
| | | | | | | | | | | | AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTeleportV2 use already available TestClient handle rather than retrieving it via the ScenePresence
| * | minor: remove unused entity transfer config in teleport v2 attachments testJustin Clark-Casey (justincc)2013-08-141-1/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-131-1/+112
|\ \ \ | |/ /
| * | Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for ↵Justin Clark-Casey (justincc)2013-08-121-1/+112
| | | | | | | | | | | | V2 transfer protocol.
* | | Merge branch 'master' into careminsterMelanie2013-08-071-3/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move experimental attachments throttling further down the chain so that ↵Justin Clark-Casey (justincc)2013-08-021-16/+15
| | | | | | | | | | | | multiple attachments changes (e.g. change outfit) are also throttled
* | | Make atachment state load work againMelanie2013-08-021-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-011-15/+87
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-15/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
* | | Merge branch 'master' into careminsterMelanie2013-07-292-2/+11
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-2/+2
| | | | | | | | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| * | Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-261-0/+9
| | | | | | | | | | | | week's SIMULATOR/0.1 protocol for now.
* | | Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
generated by cgit v1.1 at 2024-12-23 11:12:04 +0000