aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-09-1615-88/+147
|\ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-084-5/+19
| |
| * Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
| |
| * Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-084-11/+11
| |
| * Reinstate SecurePermissionsLoading functionality, default ONMelanie Thielker2013-09-081-24/+16
| |
| * Bring Core Groups up to current versionroot2013-09-0712-284/+504
| |
| * Add two argument constructor to GridInstantMessageroot2013-09-071-0/+18
| |
| * Add support for simple external CAPS texture servicesroot2013-09-071-19/+31
| |
| * Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5
| | | | | | | | was being called twice on each crossing.
| * * This fixes the border crossing offsets by storing the final keyframe ↵teravus2013-08-241-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.
| * * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-08-243-11/+48
| | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
| * Revert "* This increases accuracy when border crossing (the reason is.. ↵teravus2013-08-241-7/+7
| | | | | | | | | | | | the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop." This reverts commit 55400ff7be55b1c8dbededca68e6fce42cd6ce0f.
| * * This increases accuracy when border crossing (the reason is.. the border ↵teravus2013-08-231-7/+7
| | | | | | | | crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
* | Merge branch 'master' into careminsterMelanie2013-09-0737-114/+727
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-09-053-5/+52
| |\ \
| | * | minor: add doc about DefaultHGRegion and some of the other GridService ↵Justin Clark-Casey (justincc)2013-09-053-5/+52
| | | | | | | | | | | | | | | | region settings (though not all as of yet)
| * | | Restore group membership check for HG users in QueryAccess.Diva Canto2013-09-053-12/+17
| |/ /
| * | Stop "show client stats" from throwing an exception if somehow ↵Justin Clark-Casey (justincc)2013-09-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Scene.m_clientManager still retains a reference to a dead client. Instead, "show client stats" now prints "Off!" so that exception is not thrown and we know which entries in ClientManager are in this state. There's a race condition which could trigger this, but the window is extremely short and exceptions would not be thrown consistently (which is the behaviour observed). It should otherwise be impossible for this condition to occur, so there may be a weakness in client manager IClientAPI removal.
| * | Also check user authorization if looking to upgrade from a child to a root ↵Justin Clark-Casey (justincc)2013-09-041-0/+13
| | | | | | | | | | | | | | | | | | agent. Relevant if a child agent has been allowed into the region which should not be upgraded to a root agent.
| * | For a Hypergrid user, delay estate access checks until NewUserConnection() ↵Justin Clark-Casey (justincc)2013-09-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that they work. This is necessary because the hypergrid groups checks (as referenced by estates) require an agent circuit to be present to construct the hypergrid ID. However, this is not around until Scene.NewUserConnection(), as called by CreateAgent() in EntityTransferModule. Therefore, if we're dealing with a hypergrid user, delay the check until NewUserConnection()/CreateAgent() The entity transfer impact should be minimal since CreateAgent() is the next significant call after NewUserConnection() However, to preserve the accuracy of query access we will only relax the check for HG users.
| * | In pCampbot PhysicsBehaviour.Close(), only cancel jumping if bot is connectedJustin Clark-Casey (justincc)2013-09-031-1/+2
| | |
| * | Make pCampbot "add behaviour" and "remove behaviour" console commands work ↵Justin Clark-Casey (justincc)2013-09-031-45/+78
| | | | | | | | | | | | for all bots if no bot number is given
| * | Consistently give responsibility for thread sleeping to behaviours rather ↵Justin Clark-Casey (justincc)2013-09-033-1/+7
| | | | | | | | | | | | | | | | | | | | | than controlling from the main action loop This is to avoid excessive and inconsistent delays between behaviours that currently need to embed sleeps in other actions (e.g. physics) and other behaviours. Might need a more sophisticated approach in the long term.
| * | Add Close() method to IBehaviour to allow behaviours to cleanup when removed ↵Justin Clark-Casey (justincc)2013-09-034-1/+30
| | | | | | | | | | | | | | | | | | or bot it disconnected. In this case, it is used to turn off jump when physics testing behaviour is removed.
| * | Add pCampbot "remove behaviour" console command for removing bot behaviours ↵Justin Clark-Casey (justincc)2013-09-032-5/+60
| | | | | | | | | | | | | | | | | | during operation. Doesn't currently work very well as stopping physics, for instance, can leave bot travelling in old direction
| * | Add ability to adjust pCampbot bot behaviours whilst running with "add ↵Justin Clark-Casey (justincc)2013-09-032-41/+157
| | | | | | | | | | | | behaviour <behaviour-name> <bot-number>" console commad
| * | And fix break in "show bot" from commit 9c65207Justin Clark-Casey (justincc)2013-09-031-1/+1
| | |
| * | Fix build break from last commit 9c65207. Mono 2.4 lacks ↵Justin Clark-Casey (justincc)2013-09-031-1/+1
| | | | | | | | | | | | string.join(string, List<string>), or some auto casting is missing
| * | Show behaviours of pCampbot bots in "show bots" and "show bot" console commandsJustin Clark-Casey (justincc)2013-09-038-12/+45
| | |
| * | minor simplification of some unix date functions in Util. No functional change.Justin Clark-Casey (justincc)2013-09-031-5/+3
| | |
| * | Fix logic errors in "show grid users online" console command which didn't ↵Justin Clark-Casey (justincc)2013-09-031-3/+2
| | | | | | | | | | | | | | | | | | actually filter out users shown continuously online for more than 5 days Remove confusion in command output.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-09-031-5/+1
| |\ \
| | * | Remove test that gives issue on Windows, just let the try/catch do the work.BlueWall2013-09-021-5/+1
| | | |
| * | | Add experimental "show grid users online" console command to show grid users ↵Justin Clark-Casey (justincc)2013-09-032-4/+43
| |/ / | | | | | | | | | | | | | | | | | | | | | online from a standalone/robust instance. This is not guaranteed to be accurate since users may be left "online" in certain situations. For example, if a simulator crashes and they never login/logout again. To counter this somewhat, only users continuously online for less than 5 days are shown.
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-025-15/+85
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
| * | Comment out warning about agent updating without valid session ID for now.Justin Clark-Casey (justincc)2013-09-021-4/+4
| | | | | | | | | | | | This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
| * | Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-0215-10/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | | Merge branch 'master' into careminsterMelanie2013-09-0125-297/+943
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Profiles: Clean up some log entries caused when visiting HG avatar is using ↵BlueWall2013-08-291-16/+26
| | | | | | | | | | | | legacy profiles
| * | Initialization: move key expansion out to operate on all sources and not ↵BlueWall2013-08-291-2/+2
| | | | | | | | | | | | just environment variables
| * | Do not add a port zero to end of the hypergrid gateway host name.Robert Adams2013-08-281-1/+4
| | | | | | | | | | | | | | | | | | If the port is specified it is added but a ":0" is not added if the port is zero. This enables the hypergrid address short form "hypergridGateway:regionName" which is handled by the parser but failed because of this zero port addition.
| * | BulletSim: add some protections for processing when shutting down.Robert Adams2013-08-271-2/+2
| | | | | | | | | | | | Attempt to fix Mantis 6740 (http://opensimulator.org/mantis/view.php?id=6740).
| * | Revert "Make HG logins fall back to fallback regions if the desired region ↵Justin Clark-Casey (justincc)2013-08-261-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | fails." This is very similar to my earlier revert in bcb8605f8428a9009a2badf9c9eed06d9f59962c and fails for the same reasons. Reverting this change because it causes a problem if access is denied to the user. This reverts commit c7a8afbb8da40e09252d58d95c89b8a99a684157.
| * | Revert "Added some more debug messages."Justin Clark-Casey (justincc)2013-08-261-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer Reverting because this introduces a bug when access does fail. More detail in revert of main commit. This reverts commit ec32c1d4b69e4219fe44a38bcbc411e7996641f1.
| * | Fix exception thrown after a region has been restarted through scheduling.Justin Clark-Casey (justincc)2013-08-251-10/+22
| | | | | | | | | | | | | | | This exception was very likely harmless since it occurred after the restart had taken place, but still misleading. Thanks to SCGreyWolf for the code change suggestion in http://opensimulator.org/mantis/view.php?id=6747, though I did this in a slightly different way.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-254-6/+30
| |\ \
| | * | Added some more debug messages.Diva Canto2013-08-241-1/+4
| | | |
| | * | Potential fix for access control bug on login introduced with SeeIntoRegion ↵Diva Canto2013-08-241-1/+1
| | | | | | | | | | | | | | | | commit.
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-2412-84/+132
| | |\ \
| | | * | Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | printed the error message and not the call stack.
generated by cgit v1.1 at 2024-12-15 17:11:22 +0000