aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-233-3/+74
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Revert "Fix issue where sitting on non-root linked prims would send camera ↵Justin Clark-Casey (justincc)2013-11-231-7/+2
| | | | | | | | | | | | | | | | to wrong position in third-person and mouselook" Reverting to place on separate branch This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
| * Revert "Add line accidentally left out of recent non-root prim sit fix"Justin Clark-Casey (justincc)2013-11-231-2/+0
| | | | | | | | | | | | Reverting to place on new branch This reverts commit ed1029712a85206430fee1d4897d473517728dab.
| * Revert "Fix non-root prim sit positions for prims where a sit target has ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | | | | | been specified as well." Revert to place on separate branch for now This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.
| * Revert "Refix fix for sitting on non-root linked prims with explicit sit ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | targets." This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb.
| * Revert "fix avatar rotation when sitting on a linked part"Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | | | | | Reverting for now to place on separate branch This reverts commit 65304260af283211443a2872c46f6609d3e45649.
| * fix avatar rotation when sitting on a linked partJustin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
| * Refix fix for sitting on non-root linked prims with explicit sit targets.Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
| * Fix non-root prim sit positions for prims where a sit target has been ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | specified as well.
| * Add line accidentally left out of recent non-root prim sit fixJustin Clark-Casey (justincc)2013-11-231-0/+2
| | | | | | | | Original commit is ff4e7de7
| * Fix issue where sitting on non-root linked prims would send camera to wrong ↵Justin Clark-Casey (justincc)2013-11-231-2/+7
| | | | | | | | | | | | position in third-person and mouselook We now specify sits as offsets from the root prim, as the viewer expects.
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-152-3/+3
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| * Fix bug where removing a physical linkset would only decrement the Active ↵Justin Clark-Casey (justincc)2013-11-132-2/+73
| | | | | | | | | | | | | | Objects statistic by 1 instead of by the number of prims removed. Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest. Added regression test for this case.
* | Merge branch 'master' into careminsterMelanie2013-11-036-83/+186
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * After finishing to edit an attachment, let other avatars see the changes. ↵Oren Hurvitz2013-10-172-8/+4
| | | | | | | | (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-153-72/+158
| | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
| * Made terrain uploads thread-safeOren Hurvitz2013-10-151-0/+5
| |
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-062-2/+24
|\ \ | | | | | | | | | careminster
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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' of careminster:/var/git/careminsterteravus2013-10-0411-88/+251
| |\ \
| * \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-09-166-25/+26
| |\ \ \
| * | | | * This fixes the border crossing offsets by storing the final keyframe ↵teravus2013-09-161-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper. (cherry picked from commit e0399ccaec68889c12e4679b4d62142b49b379df)
* | | | | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-10-0411-88/+251
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | minor: Disable logging left active on regression test ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | TestSameSimulatorIsolatedRegionsV2()
| * | refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-274-12/+12
| | | | | | | | | | | | the code that this is symmetric with CloseAgent()
| * | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-274-29/+17
| | | | | | | | | | | | | | | | | | 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()
| * | minor: Add scene name to baked textures in cache log messageJustin Clark-Casey (justincc)2013-09-261-1/+1
| | |
| * | Reinsert client.SceneAgent checks into ↵Justin Clark-Casey (justincc)2013-09-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100) This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message. This is most probably why the message appeared to get lost on a proportion of entity transfers. A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
| * | Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-222-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Lock around read/write of ScenePresence.m_originRegionID to make sure that ↵Justin Clark-Casey (justincc)2013-09-201-5/+33
| | | | | | | | | | | | | | | | | | all threads are seeing the latest value and not a cached one. There is a possibilty that some V2 teleport failures are due to the viewer triggered CompleteMovement thread not seeing the change of m_originRegionID by the UpdateAgent thread.
| * | Change some message log levels in Scene.IncomingUpdateChildAgent() for ↵Justin Clark-Casey (justincc)2013-09-201-3/+3
| | | | | | | | | | | | debugging purposes
| * | UUID Gatherer: find assets used in Light Projection, Particle Systems, and ↵Oren Hurvitz2013-09-191-1/+14
| | | | | | | | | | | | Collision Sounds.
| * | For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 ↵Justin Clark-Casey (justincc)2013-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | teleport protocol even if SIMULATION/0.2 is available. This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details. Default remains "SIMULATION/0.2" Primarily for http://opensimulator.org/mantis/view.php?id=6755
| * | minor: Make SP.MakeRootAgent() private - no external code has any business ↵Justin Clark-Casey (justincc)2013-09-191-1/+1
| | | | | | | | | | | | calling this method
| * | minor: Make log message at top of ScenePresence.CompleteMovement info level ↵Justin Clark-Casey (justincc)2013-09-191-5/+5
| | | | | | | | | | | | | | | | | | | | | and comment out later log message in ScenePresence.MakeRootAgent() Need an info message since this is currently important in detecting teleport issue when not at debug log level. CompleteMovement message occurs before MakeRootAgent() one did
| * | Revert "Also check user authorization if looking to upgrade from a child to ↵Justin Clark-Casey (justincc)2013-09-191-13/+0
| | | | | | | | | | | | | | | | | | | | | a root agent." This reverts commit c7ded0618c303f8c24a91c83c2129292beebe466. This proves not to be necessary - the necessary checks are already being done via QueryAccess() before cross or teleport
| * | Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check that ↵Justin Clark-Casey (justincc)2013-09-192-1/+88
| | | | | | | | | | | | avatars are not allowed to cross into a neighbour where they are not authorized, even if a child agent was allowed.
| * | minor: correct method name in commentJustin Clark-Casey (justincc)2013-09-181-1/+1
| | |
| * | refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-182-6/+7
| | | | | | | | | | | | verb-noun is consistent with other similar methods
| * | minor: Make log message when Scene.IncomingChildAgentDateUpdate() more ↵Justin Clark-Casey (justincc)2013-09-182-4/+12
| | | | | | | | | | | | | | | | | | | | | explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root Add some comments about the mssage sequence, though much more data is at http://opensimulator.org/wiki/Teleports
| * | Reinsert comments about possible race conditions when sending bulk inventory ↵Justin Clark-Casey (justincc)2013-09-161-0/+3
| | | | | | | | | | | | updates on non-flag clothing editing
| * | BulletSim: remove chatty debug message from previous commit.Robert Adams2013-09-111-3/+3
| | |
| * | BulletSim: add position and rotation update for child prim physics update ↵Robert Adams2013-09-111-0/+20
| | | | | | | | | | | | events. Normally, physics engines do not return updates for child prims so, under normal operation, this code should never execute. Will only be used when using flexible linkset linkages.
| * | Change collision logic in SceneObjectPart so land_collision will happen.Robert Adams2013-09-091-6/+3
| | | | | | | | | | | | | | | The previous logic would generate land_collision_start and land_collision_end but would not generate the land_collision itself.
* | | Merge branch 'avination-current' into careminsterMelanie2013-09-167-26/+27
|\ \ \ | |_|/ |/| | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-082-4/+6
| | |
| * | Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-083-8/+8
| | |
| * | Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5
| | | | | | | | | | | | was being called twice on each crossing.
generated by cgit v1.1 at 2025-01-07 11:35:55 +0000