aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-05-054-20/+136
|\
| * force lower avatar density for testingUbitUmarov2012-05-051-0/+4
| |
| * UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any ↵UbitUmarov2012-05-041-2/+4
| | | | | | | | significant change like new 'velocity' or new position, etc, requests
| * Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| |
| * Add the default animation to the child agent data updateMelanie2012-05-042-0/+14
| |
| * Reverse the order of physics event unsubscription to allow GC. Adapted from ↵Melanie2012-05-041-2/+2
| | | | | | | | Unit's reverted patch
| * Retain velocity on walking crossing - adapted from Ubit's reverted patchMelanie2012-05-041-1/+13
| |
| * Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs ↵Melanie2012-05-042-28/+8
| | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);" This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb.
| * *TO TEST/REVIEW* added current default animation in animationSet.cs ↵UbitUmarov2012-05-042-8/+28
| | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
| * SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵UbitUmarov2012-05-041-12/+54
| | | | | | | | changed crossing code to restore sitting avas in case of group cross fail
| * Stabilize sit position on region crossingMelanie2012-05-031-1/+7
| |
| * Clear permissions given to the object we stand up fromMelanie2012-05-032-2/+31
| |
* | Merge branch 'master' into careminsterMelanie2012-05-0560-357/+825
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has ↵Justin Clark-Casey (justincc)2012-05-054-15/+30
| | | | | | | | | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
| * | Use the more efficient HashSet instead of List for ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | | | | | FlotasmAssetCache.m_CurrentlyWriting
| * | Don't try and update the access time of a file that is actively being cached.Justin Clark-Casey (justincc)2012-05-041-2/+6
| | | | | | | | | | | | | | | This may cause IOErrors on Windows. Aims to help with http://opensimulator.org/mantis/view.php?id=6003
| * | Temporarily add debug log lines to lsl url request and releaseJustin Clark-Casey (justincc)2012-05-041-0/+13
| | | | | | | | | | | | To help with http://opensimulator.org/mantis/view.php?id=5993
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-05-041-1/+1
| | |
| * | Mantis 60004 problems with damage and llSetDamage. In damage enabled areas ↵Talun2012-05-042-10/+60
| | | | | | | | | | | | this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
| * | Change LongCallTime on WebUtil to 3000, to match the time where request ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | handling is considered "slow". This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls. LongCallTime may need to be made configurable.
| * | refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to ↵Justin Clark-Casey (justincc)2012-05-041-6/+7
| | | | | | | | | | | | | | | | | | DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance These overloads are not publicly available on core connectors or IInventoryService.
| * | Allow deleting folders even if they're not in the TrashOren Hurvitz2012-05-041-4/+15
| | | | | | | | | | | | The functions DeleteFolders() and PurgeFolder() still work as before, i.e. they only allow deleting folders that are in the Trash. However, the functions DeleteFoldersEx() and PurgeFolderEx() can now be used to delete any folder.
| * | Calculate the Daylight Savings Time information sent to the viewer based on ↵Justin Clark-Casey (justincc)2012-05-045-5/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | US Pacific Standard Time rather than whatever timezone the login server is set to. This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time. However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation. This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST. If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local". A mailing list announcement will be made later. Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch. From http://opensimulator.org/mantis/view.php?id=5972
| * | minor: Tweak BaseHttpServer message to make it clear that this relates to ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | | | | | slow handling of inbound requests.
| * | Extend 'slow' request logging to other server outbound requests (forms, ↵Justin Clark-Casey (justincc)2012-05-041-79/+194
| | | | | | | | | | | | | | | | | | rest, async rest) as well as the existing logging on outbound OSD requests. Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-031-1/+1
| |\ \
| | * | Fixes Mantis #5999. llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause ↵Snoopy Pfeffer2012-05-031-1/+1
| | | | | | | | | | | | | | | | a runtime error.
| * | | Reinsert a 2000ms delay before closing a no longer required agent on the ↵Justin Clark-Casey (justincc)2012-05-032-6/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | source region after teleport to resolve Imprudence teleport problems. Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region. If Imprudence receives a DisableSimulator in this period, it quits. We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly. This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
| * | Remove the somewhat misleading logging of the string length of some unknown ↵Justin Clark-Casey (justincc)2012-05-033-4/+5
| | | | | | | | | | | | | | | | | | requests, as this appeared to be some kind of numbered error code. This brings these messages into line with similar messages that did not do this.
| * | minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2012-05-033-10/+5
| | |
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-0338-217/+375
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'avination'Melanie2012-05-033-10/+19
|\ \ \ | | |/ | |/|
| * | Improved sitted avatars crossings ( plus tests on vehicles)UbitUmarov2012-05-022-9/+18
| | |
| * | Bogus change to get a version numberMelanie2012-05-021-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-0213-172/+436
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ↵Justin Clark-Casey (justincc)2012-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be closed because it is no longer in the child's view distance. This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success. There are no async operations between this sleep and the WaitForCallback() If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection. If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue. Tested on standalone, local grid and distributed grid. Please revert if there's something that I've missed.
| * | Remove some test code that accidentally crept in with 9d2e1c67Justin Clark-Casey (justincc)2012-05-011-3/+0
| | |
| * | Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-0110-33/+248
| | | | | | | | | | | | | | | | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
| * | Move max teleport distance check down into etm.DoTeleport() since this ↵Justin Clark-Casey (justincc)2012-05-011-40/+41
| | | | | | | | | | | | should apply to all teleport calls, not just those through Teleport()
| * | refactor: Split most of EntityTransferModule.Teleport() into its same region ↵Justin Clark-Casey (justincc)2012-05-014-130/+198
| | | | | | | | | | | | | | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
* | | Merge branch 'avination'Melanie2012-05-025-115/+139
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-025-115/+139
| |\ \
| | * | ubitODE fix applyROtationImpulse, let vehicle hover be relative to root ↵UbitUmarov2012-04-292-15/+32
| | | | | | | | | | | | | | | | prim and not center of mass ( as SL docs said) updated some flags to current ones
| | * | ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass ↵UbitUmarov2012-04-292-97/+91
| | | | | | | | | | | | | | | | and simulate
| | * | llGetGeometricCenter...UbitUmarov2012-04-292-3/+16
| | | |
* | | | Merge branch 'avination'Melanie2012-05-024-1/+12
|\ \ \ \ | |/ / /
| * | | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-023-0/+11
| | | | | | | | | | | | | | | | work right, finally.
| * | | Fix saving of attachment positionsMelanie2012-05-011-1/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-04-3023-675/+599
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵Justin Clark-Casey (justincc)2012-04-3015-367/+55
| | | | | | | | | | | | | | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted.