afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
a64def8b73
minor: remove some mono compiler warnings
2011-11-14 18:16:14 +00:00
348d15707d
Add test for adding a friend whilst online
2011-11-14 18:08:02 +00:00
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
ff36a1bc7b
If a friends identifier which is too short is given to HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring().
...
This is to progress http://opensimulator.org/mantis/view.php?id=5789
2011-11-14 16:06:06 +00:00
49ec85ae15
Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions
...
This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
2011-11-14 15:24:02 +00:00
6daa61d6ba
Merge branch 'master' into bigmerge
2011-11-12 12:36:52 +00:00
efc6c6db7c
Fix taking or returning locked objects losing permissions for owner
2011-11-12 12:09:28 +01:00
e61ea79c72
doh - correct build break
2011-11-12 00:27:43 +00:00
f130e1a86f
Add threads to the watchdog thread list before we start them.
...
Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
2011-11-12 00:24:45 +00:00
25c32061e4
Make log messages on authentication failure more explicit
2011-11-11 23:45:08 +00:00
a4ec97cfdd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2011-11-11 23:43:18 +00:00
6adaf1be74
extract common ScenePresence setup code into Init() method for ScenePresenceSitTests
2011-11-11 23:36:35 +00:00
84ad23234b
add SP.PhysicsActor checks to other sit/stand tests
2011-11-11 23:33:55 +00:00
acaf6937c5
add sit and stand on ground test
2011-11-11 23:32:43 +00:00
a3052e40ad
extract ground sit code into SP.HandleAgentSitOnGround() for consistency with other sitting code.
2011-11-11 23:28:32 +00:00
6ce3daff94
Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.
...
Addresses http://opensimulator.org/mantis/view.php?id=5786
2011-11-11 23:15:53 +00:00
2a2cdaa211
As with prim sitting avatars, make an avatar phantom when it sits on the ground and solid again when it stands.
...
This is to avoid http://opensimulator.org/mantis/view.php?id=5783 when a collision with a ground sitting avatar causes that avatar to automatically stand and sometimes not be able to move
A better solution may be to keep gound sitting avatars solid but remove their collision status. However, this requires some physics code work.
2011-11-11 23:10:43 +00:00
ce8441132e
Restore sending of OutPacket() for object kills removed in commit c7dd7b1.
...
OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible
1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket()
2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record
3) The same thread places the kill packet on the Task queue.
4) The earlier thread resumes and places the update packet on the Task queue after the kill packet.
This results in a ghost part in the sim that only goes away after client relog.
This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject.
2011-11-11 22:37:57 +00:00
2a7f4e0602
remove unncessary IClientAPI parameter from SP.SendSitResponse()
2011-11-11 21:53:00 +00:00
b1cb4f5b04
As per mailing list last week, remove facility that would automatically move the avatar if prim with no sit target was out of sitting range.
...
Now, no movement occurs.
Note that you can still sit on a prim with an explicit sit target from any distance, as was the case before.
2011-11-11 21:42:58 +00:00
a658bddbcd
Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing list last week.
...
This means that if the avatar is within 10 meters of the selected target, it sits on it immediately without walking.
Existing autopilot outside this range will be disabled in a later commit
2011-11-11 19:59:12 +00:00
01518de0bf
update minimum mono version
2011-11-11 19:43:42 +00:00
8f4955f6a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-11 19:40:31 +00:00
dc200d7bb5
Add new ScenePresenceSitTests with a single sit/stand test
2011-11-11 19:38:36 +00:00
ed9500f08c
Merge branch 'master' into bigmerge
2011-11-11 16:32:08 +00:00
ad28238ece
one more jenkins test!
2011-11-10 21:40:11 -07:00
84ce0b487b
one more test of jenkins!
2011-11-10 21:31:06 -07:00
53528b0372
one more round with leeeeeeeeeeroy jaaaaaaenkins!
2011-11-10 21:22:07 -07:00
de24e93a1f
take two on jenkins testing!
2011-11-10 20:58:38 -07:00
621fb9aba0
test push to see if sir jenkins responds!
2011-11-10 20:54:33 -07:00
10e664eedc
Fix compile error from an earlier commit
2011-11-10 17:37:33 -08:00
3a307878fd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2011-11-11 01:24:53 +00:00
7432ca6daf
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 17:21:49 -08:00
96c59156a7
In SOP, replaced many references to private members with the public properties
2011-11-10 17:21:37 -08:00
a9fbf3a4e0
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-11-11 01:19:38 +00:00
d15d5bf181
Merge branch 'master' into bigmerge
2011-11-11 00:28:21 +00:00
a5838cf0a6
Prevent linking objects while they are deeded. On unlinking deeded objects,
...
set LastOwnerID properly so the parts cannot be transferred, circumventing
no trans perms
2011-11-11 00:28:12 +00:00
2bd4eaeb19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-10 23:43:29 +00:00
0daece6f2b
Fix turn left and turn right properly. Works for both built-ins and LSL AOs
2011-11-10 23:42:48 +00:00
8fbaa10ade
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 15:23:16 -08:00
9359293b11
Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
2011-11-10 15:20:21 -08:00
f5abae5ac6
Implement nudging support for strafing motion
2011-11-10 23:03:05 +00:00
a081df75e2
Prevent linking objects while they are deeded. On unlinking deeded objects,
...
set LastOwnerID properly so the parts cannot be transferred, circumventing
no trans perms
2011-11-10 23:59:13 +01:00
e9055cec17
Merge branch 'master' into bigmerge
2011-11-10 23:44:19 +00:00
c0d280d948
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-10 22:58:24 +00:00
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region console prompt
...
This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt
2011-11-10 22:56:13 +00:00
008b213ec0
Fix turn left and turn right properly. Works for both built-ins and LSL AOs
2011-11-10 23:15:03 +01:00
4939d99b57
Merge branch 'master' into bigmerge
2011-11-10 23:03:50 +00:00
f3fea81936
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 14:09:53 -08:00
Melanie