ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-03 07:26:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,005 Commits 5 Branches 88 Tags
69f29cb53e2b622a64a8fb46d0afea0700a3f35d
Commit Graph

426 Commits

Author SHA1 Message Date
Melanie
6b080d57cb Merge branch 'master' into careminster 2011-12-10 15:19:31 +00:00
Melanie
3a91085ac2 Implement handler for TeleportCancel inbound packet 2011-12-10 15:17:34 +00:00
Justin Clark-Casey (justincc)
f61e54892f On a new client circuit, send the initial reply ack to let the client know it's live before sending other data. 
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
 2011-12-08 18:34:23 +00:00
Melanie
96539ffc79 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 18:29:19 +00:00
Melanie
28da235888 Merge branch 'master' into bigmerge 2011-12-06 19:01:05 +00:00
Justin Clark-Casey (justincc)
319507f521 Add test for not found response from GetTexture cap handler. 
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
 2011-12-05 21:04:17 +00:00
Justin Clark-Casey (justincc)
4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse. 
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
 2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie
5ab536a1e9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-05 17:10:51 +00:00
Melanie
ec8c93aa5e Implement ChangeInventoryItemFlagsPacket handling 2011-12-04 12:35:01 +01:00
Justin Clark-Casey (justincc)
a82aea53f8 Split up test SceneHelpers to provide an AddChildScenePresence() call 2011-12-03 19:32:59 +00:00
Justin Clark-Casey (justincc)
4919c60560 Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() 
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
 2011-12-03 18:59:54 +00:00
Melanie
31736b1aac Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
89632f3ea8 Add test for removing a friendship. 2011-11-14 20:56:56 +00:00
Melanie
afca742392 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
de895ee54a Add very simple FriendsModuleTests.TestNoFriends() 2011-11-14 17:18:51 +00:00
Melanie
c7dd7b13a2 Convert SendKillObject to take a list of uint rather than sending one 
packet per prim. More to come as we change to make use of this.
 2011-11-06 20:38:07 +00:00
Melanie
02f0aa592d Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge 2011-10-25 03:19:10 +01:00
Melanie
8639b037e1 Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge 2011-10-25 03:18:59 +01:00
Melanie
de8cdbda15 Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge 2011-10-25 03:18:53 +01:00
Melanie
be2cfeb5c3 Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge 2011-10-25 03:18:49 +01:00
Melanie
da805d0cce Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge 2011-10-25 03:18:38 +01:00
Melanie
56f3da7b5a Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge 2011-10-25 03:18:29 +01:00
Melanie
dc24ac4f20 Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge 2011-10-25 02:54:34 +01:00
Melanie
353f0c0e03 Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-25 02:14:39 +01:00
Melanie
f50538c81a Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2011-10-25 01:55:01 +01:00
Melanie
2895789bd0 Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge 2011-10-25 01:51:24 +01:00
Justin Clark-Casey (justincc)
ffdf59a57c Get UUIDGatherer to scan notecards in the graph for asset uuids. 
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
 2011-10-22 02:16:46 +01:00
Justin Clark-Casey (justincc)
30320505fa redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency 2011-10-22 00:58:56 +01:00
Justin Clark-Casey (justincc)
bc2da4eaad correct misleading method doc on CreateNotecardAsset() 2011-10-22 00:55:50 +01:00
Justin Clark-Casey (justincc)
c4f8da7359 in AssetHelpers, store the actual text passed in to the method, not the string "data" 2011-10-22 00:45:47 +01:00
Justin Clark-Casey (justincc)
5d7eaedbeb encode notecard assets in proper format for tests, rather than just using whatever string is given 2011-10-22 00:21:45 +01:00
Justin Clark-Casey (justincc)
9b3bbedeea refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset() 2011-10-22 00:13:46 +01:00
Justin Clark-Casey (justincc)
120114e96b refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter 2011-10-17 20:50:29 +01:00
Justin Clark-Casey (justincc)
ddf54b5537 move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others 2011-10-15 03:03:05 +01:00
Justin Clark-Casey (justincc)
528cc8136e fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params 2011-10-15 02:54:43 +01:00
Justin Clark-Casey (justincc)
aa19ccf65c refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims. 2011-10-14 01:45:46 +01:00
Melanie
652c59c0a9 Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge 2011-10-11 22:42:18 +01:00
Melanie
6101de2316 Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:32:10 +01:00
Justin Clark-Casey (justincc)
d358125cac Reinstate option to land an npc when it reaches a target. 
This is moved into ScenePresence for now as a general facility
 2011-09-22 00:16:05 +01:00
Justin Clark-Casey (justincc)
8159fd7110 When calling osNpcMoveTo(), rotate the avatar in the direction of travel. 
This stops the npc walking backwards if the target is directly behind.
This means that the npc no longer returns to its original rotation once movement has finished.
If you want this behaviour, please store and reset the original rotation after movement.
This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678
 2011-09-21 19:28:41 +01:00
Tom
5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00
Justin Clark-Casey (justincc)
42790f021f Fix unit tests from RegionSettings commit 2011-09-09 00:47:23 +01:00
Justin Clark-Casey (justincc)
bd5d2cb043 Use scene presence agent id for rezzed object ownership rather than item owner. 
These should be identical.  However, the item isn't available when rezzing npc attachments.
 2011-09-08 20:51:52 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
899d109e82 get rid of appearance null checks - this is never null 2011-08-31 17:13:53 +01:00
Justin Clark-Casey (justincc)
be357f8fee Fix bug in persisting saved appearances for npcs 
Assets have to be marked non-local as well as non-temporary to persist.  This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
 2011-08-30 01:58:32 +01:00
Justin Clark-Casey (justincc)
c9e6b7bd10 Stop NPC's getting hypergrid like names in some circumstances. 
This meant punching in another AddUser() method in IUserManagement to do a direct name to UUID associated without the account check (since NPCs don't have accounts).
May address http://opensimulator.org/mantis/view.php?id=5645
 2011-08-19 00:45:22 +01:00
Justin Clark-Casey (justincc)
c1a34cd8da Don't try to save changed attachment states when an NPC with attachments is removed from the scene. 
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
 2011-08-18 00:53:05 +01:00
Justin Clark-Casey (justincc)
696bd44833 Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple attachments check 2011-08-17 00:37:33 +01:00