ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-15 02:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,756 Commits 5 Branches 96 Tags
516c3dfbbbbc361c8cf52e9db15c2cd099d7913a
Commit Graph

2518 Commits

Author SHA1 Message Date
Melanie
516c3dfbbb Remove some debug code that had snuck in 2011-12-01 16:12:09 +01:00
Melanie
797982ee11 Implement llTransferLindenDollars 2011-12-01 13:30:10 +01:00
Melanie
80148bf784 Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-11-28 11:21:15 +01:00
Melanie
dc612d0f08 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-11-28 11:06:38 +00:00
Justin Clark-Casey (justincc)
86cc00aaa8 minor: formatting changes in Scene.PacketHandlers.cs 2011-11-26 01:52:12 +00:00
Justin Clark-Casey (justincc)
bafea2282a Rip out unused Scene.HandleFetchInventoryDescendentsCAPS(). 
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
 2011-11-26 01:39:23 +00:00
Justin Clark-Casey (justincc)
0688861aa7 Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem 2011-11-25 22:15:29 +00:00
Justin Clark-Casey (justincc)
8e32ce85a7 Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPosition() 
At least on ODE, this wasn't doing any harm but there wasn't any point to it either
 2011-11-24 22:45:29 +00:00
Justin Clark-Casey (justincc)
a58f5b2f66 When setting packet level logging via "debug packet", apply to all clients, not just root ones. 
Also adds scene name and client type (root|child) to logged information.
 2011-11-24 22:08:34 +00:00
Melanie
a8270cb48c Merge branch 'master' into bigmerge 2011-11-24 01:16:37 +00:00
Melanie
11dfd7711b Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-11-24 00:54:52 +01:00
Justin Clark-Casey (justincc)
b0fe0464af Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines. 
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
 2011-11-22 22:13:57 +00:00
Justin Clark-Casey (justincc)
39c1ae2408 Chain SOP constructors together rather than having copy/paste code 2011-11-21 17:55:10 +00:00
Justin Clark-Casey (justincc)
58a1147870 refactor: Make SOP.Description an automatic property 2011-11-21 17:51:38 +00:00
Justin Clark-Casey (justincc)
e0887944a0 Remove unused PhysicsActor.SOPDescription 2011-11-21 17:47:30 +00:00
Melanie
bdb5ac96d9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-11-19 22:39:15 +00:00
Melanie
dec8b9c98d Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-11-19 22:26:41 +01:00
Justin Clark-Casey (justincc)
10a23a823e Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages 
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
 2011-11-19 01:16:07 +00:00
Justin Clark-Casey (justincc)
01ae916bad Don't register a region twice on both official registration and maptile regeneration. 
Maptile storage appears orthogonal to region registration
 2011-11-19 00:07:34 +00:00
Justin Clark-Casey (justincc)
cacc028835 If the entire simulator is shutting down then don't bother to unload the scripts from the appdomain in XEngine. 
All the other actions (script state save, etc.) still occur.
This makes shutdown where there are many scripts vastly quicker.
 2011-11-17 21:03:08 +00:00
Melanie
31736b1aac Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-11-17 19:04:27 +00:00
Melanie
d1c80efd41 Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-11-17 19:15:41 +01:00
Melanie
e9c386f6a6 Force a sim exit when hearbeat isn't restarting successfully 2011-11-17 19:15:11 +01:00
Justin Clark-Casey (justincc)
b6d83e9c0f Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! 
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789 yesterday
 2011-11-16 23:01:59 +00:00
Dan Lake
bd01c4a5cb Call public ForEach instead of using m_entities directly. No semantic changes, just cleanup 2011-11-16 02:33:56 -08:00
Dan Lake
baa65d4a15 In AddNewClient, iterator over copy of entities rather than copying under read lock 2011-11-15 17:09:17 -08:00
Justin Clark-Casey (justincc)
31ffd5450b Make tracked per scene thread names conform to the majorirty format. 
This is <thread-name> (<region-name>)
 2011-11-15 23:34:28 +00:00
Justin Clark-Casey (justincc)
828e4a5b09 Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another. 2011-11-15 20:26:42 +00:00
Justin Clark-Casey (justincc)
a3c5f76942 Removed unused and mostly commented out SceneCommunicationService methods 
As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests
 2011-11-15 18:16:43 +00:00
Justin Clark-Casey (justincc)
20f26eeb17 Remove unused RegionCommsListener/IRegionCommsListener. 
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
 2011-11-15 17:38:55 +00:00
Justin Clark-Casey (justincc)
64784bc0cf remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead 2011-11-15 17:30:58 +00:00
Justin Clark-Casey (justincc)
50803dfe2c For clients that are entering a simulator from initial login, stop executing FriendsModule.FetchFriendslist() asychronously. 
Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated.
Changing this to synchronous may improve issues where a user does not see friends as online even though they are.
I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required.  Locking the cache isn't sufficient.
 2011-11-15 15:57:53 +00:00
Dan Lake
ed19284d85 Merge branch 'remove-scene-viewer' 2011-11-14 12:37:48 -08:00
Melanie
df35720cf5 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneViewer.cs
 2011-11-14 20:34:49 +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)
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
Melanie
efc6c6db7c Fix taking or returning locked objects losing permissions for owner 2011-11-12 12:09:28 +01:00
Dan Lake
5fd1749150 Remove SceneViewer from ScenePresence to reduce quadruple queueing of 
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack

Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
 2011-11-11 17:16:52 -08:00
Melanie
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
Justin Clark-Casey (justincc)
6adaf1be74 extract common ScenePresence setup code into Init() method for ScenePresenceSitTests 2011-11-11 23:36:35 +00:00
Justin Clark-Casey (justincc)
84ad23234b add SP.PhysicsActor checks to other sit/stand tests 2011-11-11 23:33:55 +00:00
Justin Clark-Casey (justincc)
acaf6937c5 add sit and stand on ground test 2011-11-11 23:32:43 +00:00
Justin Clark-Casey (justincc)
a3052e40ad extract ground sit code into SP.HandleAgentSitOnGround() for consistency with other sitting code. 2011-11-11 23:28:32 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
2a7f4e0602 remove unncessary IClientAPI parameter from SP.SendSitResponse() 2011-11-11 21:53:00 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8f4955f6a9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-11-11 19:40:31 +00:00
Justin Clark-Casey (justincc)
dc200d7bb5 Add new ScenePresenceSitTests with a single sit/stand test 2011-11-11 19:38:36 +00:00
Dan Lake
10e664eedc Fix compile error from an earlier commit 2011-11-10 17:37:33 -08:00