aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-115-3/+36
|\ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * Fix test for adding temporary assets. Code for non-local temporary assetsMic Bowman2013-06-101-0/+20
| | | | | | | | is there but commented out.
| * Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-102-2/+2
| | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
| * Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
| |
| * Merge branch 'profiles'BlueWall2013-06-072-0/+4
| |\ | | | | | | | | | message to explain why this merge is necessary,
| | * SQLite support for UserProfilesBlueWall2013-06-071-0/+1
| | |
| | * Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
| | |
| * | Supply proper type information for the various types of requestsMelanie2013-06-071-6/+6
| | |
| * | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-071-4/+4
| |/
* | Merge branch 'master' into careminsterMelanie2013-06-072-4/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * In LocalFriendshipTerminated, send the original client's agentId to the ↵Donnie Roberts2013-06-072-4/+4
| | | | | | | | friend being removed instead of the friend's own id.
* | Merge branch 'master' into careminsterMelanie2013-06-061-0/+5
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-052-0/+6
| |\
| | * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-062-0/+6
| | | | | | | | | | | | may yield unexpected results in some cases. No database persistence yet,
| * | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
| |/
* | Merge branch 'avination-current' into careminsterMelanie2013-06-066-18/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Allow Linden trees to preserve their type when taken into inventory and ↵Melanie2013-05-261-3/+12
| | | | | | | | | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
| * | Reset "Show in search" on parcels cut off other parcels that are in searchMelanie2013-05-241-0/+2
| | |
| * | Refactor to get closer to coreMelanie2013-05-111-2/+2
| | |
| * | Remove dumb "Region found!" message from map searchMelanie2013-05-061-2/+2
| | |
| * | Implement llSetContentType using the new OpenID auth support for authenticationMelanie2013-05-051-1/+50
| | |
| * | 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.
| * | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵Melanie2013-04-301-2/+8
| |\ \ | | | | | | | | | | | | into avination-current
| | * | Fix bug where an agent that declined an inventory offer and subsequently ↵Justin Clark-Casey (justincc)2013-04-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
| * | | 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.
| * | Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-251-2/+1
| | |
| * | Gods module cleanupMelanie2013-04-251-10/+0
| | |
* | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-061-14/+18
|\ \ \ | | |/ | |/|
| * | Prevent processing for NpcBlueWall2013-06-051-1/+3
| | |
| * | Remove a couple of orphaned linesBlueWall2013-06-051-3/+0
| | |
| * | Make locking more uniformBlueWall2013-06-051-14/+19
| | |
* | | 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
generated by cgit v1.1 at 2024-12-24 00:13:14 +0000