aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-044-9/+1562
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding back the BasicProfileModuleBlueWall2013-05-312-73/+191
| |
| * UserProfilesBlueWall2013-05-304-176/+1613
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
| * minor: fix warnings in GodsModule that were due to duplicate using statementsJustin Clark-Casey (justincc)2013-05-301-11/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-05-302-1/+77
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * Try caching the user name for a new agent earlier on in the process of ↵Justin Clark-Casey (justincc)2013-05-292-2/+2
| | | | | | | | | | | | | | | | | | | | establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues. The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding. However, in theory the incoming agent should have made that binding before any such request is triggered. So moving this binding to an earlier point in the process to see if this makes a difference. Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache. This relates to http://opensimulator.org/mantis/view.php?id=6625
| * Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-291-0/+76
| |
| * Protect one more update of the baked texture hashes.Mic Bowman2013-05-241-2/+5
| |
| * This is an experimental patch that adds support for comparing textureMic Bowman2013-05-241-45/+57
| | | | | | | | | | | | | | | | | | | | hashes for the purpose of accurately responding to AgentTextureCached packets. There is a change to IClientAPI to report the wearbles hashes that come in through the SetAppearance packet. Added storage of the texture hashes in the appearance. While these are added to the Pack/Unpack (with support for missing values) routines (which means Simian will store them properly), they are not currently persisted in Robust.
* | Merge branch 'master' into careminsterMelanie2013-05-241-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| * Fix bug where both ordinary UserManagementModule and HGUserManagementModules ↵Justin Clark-Casey (justincc)2013-05-231-1/+1
| | | | | | | | | | | | | | were being added to scenes if no UserManagementModule was specified. Without explicit config non-hg UMM is used - this is in common with other HG modules. This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case.
* | Merge branch 'master' into careminsterMelanie2013-05-244-37/+101
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-221-0/+9
| | | | | | | | | | | | This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
| * To further help with tracking down the apperance of too much "Unknown User" ↵Justin Clark-Casey (justincc)2013-05-213-5/+5
| | | | | | | | | | | | | | in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials) This is to help with http://opensimulator.org/mantis/view.php?id=6625
| * Fix compile failure from recent git master 434c3cfJustin Clark-Casey (justincc)2013-05-211-1/+1
| |
| * Make "show name" command display HomeURL like "show names"Justin Clark-Casey (justincc)2013-05-211-4/+11
| |
| * minor: Change "show names" command to use consistent console display tableJustin Clark-Casey (justincc)2013-05-211-15/+9
| |
| * Add "show name" console command to make it possible to show a single binding ↵Justin Clark-Casey (justincc)2013-05-211-0/+34
| | | | | | | | of a UUID to a name.
| * Log when "Unknown User" is sent to a user because the UMM had no binding for ↵Justin Clark-Casey (justincc)2013-05-211-17/+32
| | | | | | | | | | | | | | that UUID and when a binding replaces a previous "Unknown User" entry. This is a temporary measure to hunt down issues where some but not all users see others as "Unknown user" in text chat, etc. http://opensimulator.org/mantis/view.php?id=6625
| * Lock m_UserCache whilst iterating over it in ↵Justin Clark-Casey (justincc)2013-05-211-4/+9
| | | | | | | | UserManagementModule.GetUserData() to avoid concurrency exceptions
* | Merge branch 'master' into careminsterMelanie2013-05-162-1/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * minor: remove long commented out scene cache clearing code in ↵Justin Clark-Casey (justincc)2013-05-161-9/+0
| | | | | | | | EntityTransferModule.CrossAgentToNewRegionAsync()
| * minor: Remove completely unused IClientAPI.RequestClientInfo() call from ↵Justin Clark-Casey (justincc)2013-05-161-3/+0
| | | | | | | | EntityTransferModule.CrossAgentToNewRegionAsync()
| * Where this is not already happening, trigger asychoronous calls to ↵Justin Clark-Casey (justincc)2013-05-162-1/+2
| | | | | | | | | | | | | | CloseChildAgent() above the LocalSimulationConnector level. This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes). No functional change apart from elimination of unnecessary chaining of new threads.
* | Merge branch 'master' into careminsterMelanie2013-05-122-8/+50
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵Diva Canto2013-05-112-35/+19
| | | | | | | | about who has permission to set home where.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-111-0/+12
| |\
| * | Handle SetHome properlyDiva Canto2013-05-111-0/+59
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-112-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-112-3/+3
| |\ \ | | |/
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-1/+1
| | |
| | * Fix issue where objects removed via llDie() would not disappear for users ↵Justin Clark-Casey (justincc)2013-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | looking in from neighbouring sims. This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason. Added regression test for this case. This fixes http://opensimulator.org/mantis/view.php?id=6627
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-0/+12
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-083-9/+73
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Guard the scene list when estates are updatedMelanie2013-05-082-9/+14
| |
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | Merge branch 'master' into careminsterMelanie2013-05-085-35/+806
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-072-35/+39
| |
| * Step 3: Commit the Avination XEstate estate comms handlerMelanie2013-05-073-0/+767
| | | | | | | | This adds estate-wide Teleport Home and Teleport All User Home as well
| * Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-073-24/+67
| | | | | | | | (complete module) as changes are too extensive to apply manually
* | Merge branch 'master' into careminsterMelanie2013-05-043-16/+35
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Fix possible race condition with local region cache if a region was added ↵Justin Clark-Casey (justincc)2013-05-031-15/+28
| | | | | | | | after startup.
| * Fix inventory issueBlueWall2013-05-011-0/+6
| | | | | | | | Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
* | Merge branch 'master' into careminsterMelanie2013-05-012-3/+4
|\ \ | |/ | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Fix the long standing bug of items being delivered to lost and found or ↵Melanie2013-05-011-2/+3
| | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission.
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+1
| | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* | Merge branch 'master' into careminsterMelanie2013-04-302-86/+464
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
| |
| * Add regression test for inventory item give, reject and subsequent trash ↵Justin Clark-Casey (justincc)2013-04-291-0/+256
| | | | | | | | | | | | folder purge by receiver. This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
| * Add regression test for offer, accept and subsequent receiver delete of an ↵Justin Clark-Casey (justincc)2013-04-291-80/+3
| | | | | | | | item offered via instant message.
generated by cgit v1.1 at 2024-12-30 03:57:58 +0000