aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-232-22/+60
|\
| * EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| | | | | | | | | | to prevent avatars being locked into their sim on a failed teleport. May have side effects and must be revisited to fix right.
| * Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
| |
| * Implement HTTP Request froma thread pool to avoid packet congestionMelanie2013-01-201-14/+45
| |
| * Revert "Refactor scripted http request to use async calls rather than hard ↵Melanie2013-01-201-87/+53
| | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b.
| * Refactor scripted http request to use async calls rather than hard threadsMelanie2013-01-201-53/+87
| |
* | Merge branch 'avination'Melanie2013-01-192-262/+71
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * Remove the core groups moduleMelanie2013-01-191-252/+0
| |
| * Kill the dumb Opensimulator Testing group again - for good.Melanie2013-01-191-8/+3
| |
| * * Enables loading cached bakes on teleport by filling in the appropriate ↵teravus2013-01-161-2/+71
| | | | | | | | | | | | avatar fields from the bake data. No more auto rebaking on teleport assuming your wearables, bakes and cache are consistent. * Speeds up appearance sending.. since there's nothing to wait for.
* | Merge branch 'master' into careminsterMelanie2013-01-161-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * | Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
| | |
| * | Implement a workaround solution for saving manual script state changes by ↵Justin Clark-Casey (justincc)2013-01-111-5/+19
| | | | | | | | | | | | | | | | | | | | | the user before logout instead of wrongly removing the script early. This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen. This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
| * | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-1/+17
| | | | | | | | | | | | | | | | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* | | Merge branch 'master' into careminsterMelanie2013-01-111-7/+12
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-7/+12
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* | | Merge branch 'master' into careminsterMelanie2013-01-101-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | On baked texture save, replace any HG ID with an ordinary asset ID so the ↵Justin Clark-Casey (justincc)2013-01-101-0/+3
| | | | | | | | | | | | HGAssetBroker doesn't try to save back to the avatar's originating region
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-6/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-6/+1
| | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
* | | Merge branch 'avination' into careminsterMelanie2013-01-063-11/+40
|\ \ \ | |/ /
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+13
| | |
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-212-11/+27
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2013-01-0411-97/+179
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ↵Justin Clark-Casey (justincc)2013-01-031-1/+4
| | | | | | | | | | | | we're deselecting the prim in code before scheduling an update on attachment
| * | Fix problem where object attached from ground often does not get attached ↵Justin Clark-Casey (justincc)2013-01-031-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | properly. It seems this is happening because we send a kill for objects that are selected when attached. A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill. Aims to address http://opensimulator.org/mantis/view.php?id=6456
| * | minor: Change channel digger replacement message in TerrainModule to Info ↵Justin Clark-Casey (justincc)2013-01-031-1/+1
| | | | | | | | | | | | | | | | | | from Warn. This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
| * | Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-022-20/+27
| | | | | | | | | | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
| * | Fixed: the AvatarEnteringNewParcel event wasn't triggered in some casesOren Hurvitz2013-01-021-0/+6
| | | | | | | | | | | | If an avatar moved between regions: A -> B -> A, then when returning to region A the AvatarEnteringNewParcel wasn't triggered. This happened because the ScenePresence in region A still remembered its previous 'currentParcelUUID', so it appeared as if the avatar didn't change parcels. Now, however, when a ScenePresence becomes a child presence we clear its 'currentParcelUUID'.
| * | minor: minor code and log formatting fixes to recent changes in ↵Justin Clark-Casey (justincc)2013-01-021-5/+6
| | | | | | | | | | | | LandManagementModule
| * | Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-023-39/+61
| | |
| * | If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-024-26/+37
| | | | | | | | | | | | that the operation failed
| * | Implemented Return Objects when it's invoked from the Top Colliders or Top ↵Oren Hurvitz2013-01-021-5/+55
| | | | | | | | | | | | Scripts dialogs
* | | Merge branch 'avination' into careminsterMelanie2012-12-185-16/+155
|\ \ \ | | |/ | |/|
| * | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-135-13/+128
| | | | | | | | | | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED*
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-8/+23
| | | | | | | | | | | | since at least for now seems good enought
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-1/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-163-5/+47
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Fix sounds so that they play from inventory after teleport rather than only ↵Justin Clark-Casey (justincc)2012-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | on initial login region. Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012) We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient Addresses http://opensimulator.org/mantis/view.php?id=6453 Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
| * | HGAssetMapper: Get wasn't really working. It's true that some assets are ↵Diva Canto2012-12-091-3/+35
| | | | | | | | | | | | copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids.
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-0/+10
| | | | | | | | | | | | Inventory transfers: don't do async on asset transfers or now.
* | | Merge branch 'master' into careminsterMelanie2012-12-091-70/+68
|\ \ \ | |/ /
| * | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
* | | Merge branch 'master' into careminsterMelanie2012-12-076-10/+21
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Fix more compiler warnings in CoreModules tests by properly ↵Justin Clark-Casey (justincc)2012-12-055-5/+16
| | | | | | | | | | | | overriding OpenSimTestCase.SetUp()
| * | minor: also comment out the debug log message which reports searching for ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | | | | | | | | | | | child agents in simulator scenes for now.
| * | minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
| | |
| * | Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-303-17/+78
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-271-3/+57
| |\ \
generated by cgit v1.1 at 2024-12-25 19:50:51 +0000