ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-28 09:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,803 Commits 5 Branches 83 Tags
fa844d7e6ee88552d9095dc7a6330eeba767b3e9
Commit Graph

3464 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
95a686dbf5 Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once 2011-11-25 23:45:29 +00:00
Justin Clark-Casey (justincc)
5b4fe23f7f Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail. 
Introduced just a few commits ago in 0688861
 2011-11-25 23:43:57 +00:00
Justin Clark-Casey (justincc)
676d32974a Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents. 
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
 2011-11-25 22:46:42 +00:00
Justin Clark-Casey (justincc)
8c82ff16ad Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings 
These cover a wider range of types.
 2011-11-25 21:54:31 +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
Justin Clark-Casey (justincc)
0a60e9537f comment out a noisy log line I accidentally left in from the last commit 2011-11-24 21:30:40 +00:00
Justin Clark-Casey (justincc)
63c137820b Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler. 
This allows us to comment out a bunch of code and simplify the codebase and readability.
 2011-11-24 21:27:35 +00:00
Justin Clark-Casey (justincc)
0174e326e3 Add a "debug eq" console command for debugging. 
This will log outgoing event queue message names if turned on.
 2011-11-24 20:27:11 +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)
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
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)
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
Melanie
323b76cee4 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2011-11-06 20:54:13 +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
243acef917 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-11-03 00:06:14 +00:00
Dan Lake
e2c51a977d Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. 
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".

UpdateFlag and Schedule*Update will both be made private shortly.

UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
 2011-11-02 14:59:00 -07:00
Melanie
c55e161dc4 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-11-02 11:49:25 +00:00
Dan Lake
7c8bfac11b Removed redundant SceneContents property from Scene. It's the same as SceneGraph property. 2011-11-01 17:20:12 -07:00
Melanie
083b28de8c Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2011-10-30 10:16:25 +00:00
Justin Clark-Casey (justincc)
5ae8de3c00 Stop setting _position as well as m_taint_position in ODECharacter.Position 
setting position at the same time as taint appears to undermine the whole purpose of taint
testing doesn't reveal any obvious regressions in doing this
 2011-10-29 01:39:48 +01:00
Melanie
b975cbcbed Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-10-27 18:14:38 +01:00
Justin Clark-Casey (justincc)
e210d95821 Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference. 
Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
 2011-10-27 02:50:58 +01:00
Melanie
fd22159d0c Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Framework/Watchdog.cs
 2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around. 
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this.  This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
 2011-10-25 20:24:21 +01:00
Melanie
c8dfef1583 Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge 2011-10-25 03:26:44 +01:00
Melanie
a055dd39ac Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge 2011-10-25 03:26:34 +01:00
Melanie
740077a291 Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge 2011-10-25 03:26:20 +01:00
Melanie
dc24ac4f20 Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge 2011-10-25 02:54:34 +01:00
Melanie
51fd5bac5e Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2011-10-25 02:54:24 +01:00
Melanie
2895789bd0 Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge 2011-10-25 01:51:24 +01:00
Melanie
747786aac0 Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge 2011-10-25 01:43:05 +01:00
Melanie
9ceb98344a Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge 2011-10-25 01:37:11 +01:00
Melanie
13d635d1d7 Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge 2011-10-25 01:37:01 +01:00
Melanie
0b833c458a Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge 2011-10-25 01:35:51 +01:00
Melanie
080a41e9f9 Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge 2011-10-25 01:35:30 +01:00
Justin Clark-Casey (justincc)
9ec672c70b Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler 
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
 2011-10-24 23:16:03 +01:00
Justin Clark-Casey (justincc)
79d5bc9beb separate out future common setup code from EventQueueTests.AddForClient() 2011-10-24 22:29:13 +01:00
Justin Clark-Casey (justincc)
e28e2d24c7 Add new EventQueueTests with basic test to check that adding a client registers an http poll 2011-10-24 22:23:41 +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)
96ff2c63ed Add avatar names to debug packet output 2011-10-17 20:37:01 +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
Justin Clark-Casey (justincc)
20da04fd0c More method doc and formatting changes. Makes DestroyOdeStructures() private 2011-10-13 21:42:24 +01:00
Justin Clark-Casey (justincc)
631d5e16ef Get rid of some traces of the old pre-ROBUST grid architecture config 2011-10-12 21:51:34 +01:00
Justin Clark-Casey (justincc)
f5f7ca47ea Bring LindenUDP.Tests back from the dead. No tests are running. 
Code drift means that most of this stuff doesn't compile but the structure is still useful.
 2011-10-12 21:31:22 +01:00
Justin Clark-Casey (justincc)
c5826d589a minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks 2011-10-12 19:35:40 +01:00
Justin Clark-Casey (justincc)
f9ffd2538f Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection 2011-10-12 19:22:30 +01:00
Melanie
f4de1a6d9b HACK: Remove advanced property resending until it is fixed properly in core. 2011-10-12 06:48:40 +02:00
Melanie
1b3ea64fe9 Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-11 23:21:36 +01:00
Melanie
ef9a811ea6 Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-11 23:17:47 +01:00
Melanie
308b6937ad Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge 2011-10-11 22:53:53 +01:00