6d04a213d6
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-18 20:25:16 -07:00
233e16b99c
* Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away
...
* Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters
* Made Parallel.ProcessorCount public
* Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes()
* More cleanup of the ScenePresences vs. ClientManager nightmare
* ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
2009-10-18 20:24:20 -07:00
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
baed19d068
A bit of instrumentation to figure out what's going on with physics actors.
2009-10-18 16:48:44 -07:00
1dbbf6edb6
* Process the avatar terse update priority queue as soon as an update for our own avatar is ready to send
...
* Reduce the scope of the locks when processing the update queues
* Reuse the ImprovedTerseObjectUpdate.RegionData block
2009-10-18 03:15:36 -07:00
2f2eeb6731
Zero out PrimitiveBaseShape.SculptData after the JPEG2000 data has been decoded to allow garbage collection on it
2009-10-18 02:53:36 -07:00
b4526a5a6d
* Big performance increase in loading prims from the region database with MySQL
...
* Handle the AgentFOV packet
* Bypass queuing and throttles for ping checks to make ping times more closely match network latency
* Only track reliable bytes in LLUDPCLient.BytesSinceLastACK
2009-10-18 02:00:42 -07:00
a3f93cffb4
* Committing Nini.dll with the patch from #3773 applied
...
* Fixing a log message typo
2009-10-17 22:06:36 -07:00
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
e28ac42486
Wrapped the contents of the IncomingPacketHandler loop in a try/catch statement
2009-10-17 17:19:18 -07:00
66923983a7
Add support for display of the script compilation errors in the script editor's
...
debug pane. This will still use DEBUG_CHANNEL currently, since it is not
fully implemented. This also removes the "Compiled successfully" message
that pops up in the viewer.
2009-10-17 22:36:44 +01:00
cdcbd22ba8
Merge branch 'master' into prioritization
2009-10-17 14:51:17 +01:00
c7da13eb23
Adds SendAvatarInterestsUpdate to IClientAPI
...
Thank you, Fly-Man
2009-10-17 14:50:21 +01:00
9c21d672d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 18:32:12 -07:00
01051daaab
* One more tweak to inform the user that they may not be able to move until relogging.
2009-10-16 21:24:08 -04:00
d49424c421
* After seeing it repeat over and over again.. again, We won't inform the scenepresence that there was an issue so it doesn't try to make the capsule again. I have a feeling that this is some kind of object leak. We'll know for sure.. soon.
2009-10-16 21:20:55 -04:00
c81378dc22
Changing avatar movement updates to the Task throttle category until we get finer grained prioritization of avatars vs. prims
2009-10-16 17:33:41 -07:00
7d6d94a7b5
More debugging of RegionCombinerModule.RegionLoaded() by making RegionLoaded() a two line function
2009-10-16 16:49:13 -07:00
31dfe87570
Prevent oversized packets from crashing the LLUDP server. It will now print a friendly error message and drop the packet
2009-10-16 14:26:58 -07:00
1bd9202f24
* Simplified the prioritization packet creation code to reduce CPU usage and increase throughput. Apologies to Jim for hacking on your code while it's only halfway done, I'll take responsibility for the manual merge
...
* Changed LLUDP to use its own MTU value of 1400 instead of the 1200 value pulled from the currently shipped libomv
2009-10-16 14:17:13 -07:00
b813058635
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 13:29:12 -07:00
f5964347bd
* fix previous commit
2009-10-16 16:25:48 -04:00
e776dfb1d7
* Changing the "clean dropped attachments" MySQL command to a using statement inside a try/catch. This statement times out for me very frequently
...
* More verbose logging when zerocoding fails on an outbound packet
2009-10-16 13:22:45 -07:00
ac31cb89d5
* Ensure that at least 20 frames run before letting avatar in.
2009-10-16 16:22:10 -04:00
eee1318597
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 12:42:53 -07:00
a18489dc9b
* Change appearance packets from State to Task. This will hopefully fix the cloud issues
...
* Changed the throttling logic to obey the requested client bandwidth limit but also share bandwidth between some of the categories to improve throughput on high prim or heavily trafficked regions
2009-10-16 12:20:01 -07:00
0079d0a7c4
* One more attempt at the NullRef In The OdePlugin. This might fix it, but it will definitely get us closer to the root cause.
2009-10-16 14:30:55 -04:00
5a4fda9dc3
Updating OpenSim.ini.example with the section required to enable a useful prioritization scheme
2009-10-16 11:09:18 -07:00
06354a093d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 10:09:19 -07:00
5de657cf5d
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-16 13:29:07 +01:00
0487092d15
Thank you, Fly man, for plumbing the AvatarInterestsUpdate packet
2009-10-16 13:28:40 +01:00
67afa9e633
* Make sure to unregister the OutOfBounds Physics event in RemoveFromPhysicalScene or we'll be leaking
2009-10-16 03:52:57 -04:00
1f28c6208b
* Added a message for when the null reference exception occurs to make debugging easier. Without this, from the user's perspective.. they cannot move, fly or otherwise do anything physical and without a message on the console, it would be hard to tell that this is what is occurring.
2009-10-16 03:40:44 -04:00
ac2f98b846
* A hacky attempt at resolving mantis #4260 . I think ODE was unable to allocate memory, and therefore the unmanaged wrapper call fails or worse.. there's some unmanaged resource accounting in the ODEPlugin for ODECharacter that isn't being done properly now.
...
* The broken avatar may not be able to move, but it won't stop simulate from pressing on now. And, the simulator will try to destroy the avatar's physics proxy and recreate it again... but if this is what I think it is, it may not help.
2009-10-16 03:32:30 -04:00
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
df2d5a460f
Replaced the update lists with a priority queue implementation in LLClientView
...
Replaced the update lists with a priority queue implementation in LLClientView.
The priority queues are based on the MinHeap implementation also included in
this commit within the OpneSim.Framework namespace. Initially setup to exactly
mimic the behavior beofre the change which was a first come first serve queue.
2009-10-15 15:52:53 -07:00
d44b50ee46
* Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time
...
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
2009-10-15 15:25:02 -07:00
642084c2a9
Merge branch 'master' into vehicles
2009-10-15 21:16:05 +01:00
6deef7d0f3
Merge branch 'master' into vehicles
2009-10-15 21:14:13 +01:00
6d3d985511
* Request from lkalif to have the Sim send a coarselocationupdate for each avatar in the sim, including yourself.
...
* Apparently the LLClientView should have been doing this previously.. Also fixed the 'You' on the index block.. so the client doesn't display an extra green dot.
* Thanks lkalif for bringing it to our attention.
2009-10-15 02:01:29 -04:00
b1c93cd3b1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-14 19:24:09 -07:00
4790f8576c
* Replaced (possibly broken?) math for calculating the unix timestamp in MySQLAssetData with Utils.DateTimeToUnixTime()
...
* Disabled UpdateAccessTime() function since it was only writing zeros anyways. This gave me a significant performance improvement for startup times and avatar logins in standalone mode
* Load attachments asynchronously so avatars with lots of attachments don't have to race the timeout clock to login
2009-10-14 19:23:44 -07:00
cd321ec4d2
Moved some code up to AddRegion, so that other modules that depend on it don't crash. This code needs to be removed as soon as user services is refactored.
2009-10-14 19:15:11 -07:00
fe4109a5b0
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 16:48:42 -07:00
06990b074c
Allow the LLUDP server to run in either synchronous or asynchronous mode with a config setting, defaulting to synchronous mode
2009-10-14 16:48:27 -07:00
82012ec4e3
* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow more tweaking in the future
2009-10-14 16:21:48 -07:00
6bdd6ae0a0
Merge branch 'master' into htb-throttle
2009-10-14 23:31:38 +01:00
1e9e9df0b3
* Switched to a plain lock for the ClientManager collections and protected the TryGetValues with try/catch instead of a lock
...
* Added ClientManager.ForEachSync() for operations that need to run synchronously, such as "show connections"
2009-10-14 14:25:58 -07:00
25878d6828
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 13:00:42 -07:00
c033477d2f
* Read scene_throttle_bps from the config file and use it
...
* Minor formatting cleanup
2009-10-14 11:52:48 -07:00
4b5a2f8c02
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 11:44:17 -07:00
0d2e6463d7
* Minimized the number of times textures are pulled off the priority queue
...
* OnQueueEmpty is still called async, but will not be called for a given category if the previous callback for that category is still running. This is the most balanced behavior I could find, and seems to work well
* Added support for the old [ClientStack.LindenUDP] settings (including setting the receive buffer size) and added the new token bucket and global throttle settings
* Added the AssetLoaderEnabled config variable to optionally disable loading assets from XML every startup. This gives a dramatic improvement in startup times for those who don't need the functionality every startup
2009-10-14 11:43:31 -07:00
bea13e3709
Setting changeY in border crossing.
2009-10-14 11:01:46 -07:00
3795cface2
Enable LSL dialogs to display group names properly
2009-10-14 17:39:38 +01:00
d83ace0d3b
Merge branch 'master' into htb-throttle
2009-10-14 05:10:43 +01:00
4135b0c4dc
* Split Task category into Task and State
...
* Crude prioritization hack
2009-10-13 19:45:38 -07:00
5976ac16b0
Optimized heartbeat by calling Update() only on updated objects.
...
During the heartbeat loop, Update() is called on every SceneObjectGroup which in turn checks if any SceneObjectPart has changed. For large regions (> 100k prims) this work consumes 20-30% of a CPU even though there are only a few objects updating each frame.
There is only one other reason to check every object on every frame, and that is the case where a script has registered the object with an "at target" listener. We can easily track when an object is registered or unregistered with an AtTarget, so this is not a reason to check every object every heartbeat.
In the attached patch, I have added a dictionary to the scene which tracks the objects which have At Targets. Each heartbeat, the AtTarget() function will be called on every object registered with a listener for that event. Also, I added a dictionary to SceneGraph which stores references to objects which have been queued for updates during the heartbeat. At each heartbeat, Update() is called only on the objects which have generated updates during that beat.
2009-10-13 19:32:59 -07:00
31a61bbeec
* Fixes some prim crossings on megaregions with regions beyond the 512m mark
...
* There's a slight chance that this could cause a problem with regular prim crossings.. but hopefully not. Revert if it does.
2009-10-13 22:03:53 -04:00
e8c1e69a0d
* Copied LocklessQueue.cs into OpenSim.Framework and added the .Count property and .Clear() method
...
* Changed the way the QueueEmpty callback is fired. It will be fired asynchronously as soon as an empty queue is detected (this can happen immediately following a dequeue), and will not be fired again until at least one packet is dequeued from that queue. This will give callbacks advanced notice of an empty queue and prevent callbacks from stacking up while the queue is empty
* Added LLUDPClient.IsConnected checks in several places to prevent unwanted network activity after a client disconnects
* Prevent LLClientView.Close() from being called twice every disconnect
* Removed the packet resend limit and improved the client timeout check
2009-10-13 18:56:54 -07:00
dc11643c00
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
...
* Added some missing implementations of IClientAPI.RemoteEndPoint
* Added a ClientManager.Remove(UUID) overload
* Removed a reference to a missing project from prebuild.xml
2009-10-13 17:33:45 -07:00
395a8680c3
* Fixed a bug where clients were being added to ClientManager twice
...
* Changed the ClientManager interface to reduce potential errors with duplicate or mismatched keys
* Added IClientAPI.RemoteEndPoint, which can (hopefully) eventually replace IClientAPI.CircuitCode
* Changed the order of operations during client shutdown
2009-10-13 16:53:19 -07:00
23a334b9f5
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
...
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
2009-10-13 14:50:03 -07:00
c893761319
* Unregister event handlers in LLUDPServer when a client logs out and disconnects
...
* Move ViewerEffect handling to Scene.PacketHandlers
* Removing the unused CloseAllAgents function
* Trimming ClientManager down. This class needs to be reworked to keep LLUDP circuit codes from intruding into the abstract OpenSim core code
2009-10-13 12:50:59 -07:00
f55b282078
Avoid checking m_clients collection twice when a UseCircuitCode packet is received
2009-10-13 11:28:08 -07:00
82ace481c9
* Broke the circular reference between LLClientView and LLUDPClient. This should speed up garbage collection on the large LLClientView objects, and also prevents handling packets for disconnected clients
...
* Renamed local LLUDPClient variables to udpClient to avoid naming confusion between LLUDPClient and LLClientView
2009-10-13 11:14:45 -07:00
3828b3c0e8
* Eliminated unnecessary parameters from LLUDPServer.SendPacketData()
...
* Changed PrimMesher's Quat.Identity to return <0,0,0,1> instead of <0,0,0,1.1>
2009-10-13 10:38:35 -07:00
e3d5beebfb
Better handling of missing assets.
2009-10-13 06:39:11 -07:00
f3d2192cd4
Better handling of missing assets.
2009-10-12 18:30:06 -07:00
63ed605eba
Stop the recurring texture requests for textures that truly don't exist.
2009-10-12 17:36:13 -07:00
0cfbdf3894
Added this one file for the previous commit to work.
2009-10-12 17:01:03 -07:00
c0beeb929e
* Fixes http://opensimulator.org/mantis/view.php?id=4225
...
* Fixes http://opensimulator.org/mantis/view.php?id=3959
* Allows for viewing inventory textures outside home grid
2009-10-12 17:00:01 -07:00
bf68dad643
0004246: [Patch] FlotsamAssetCache deep scan & cache
...
Thank you, mcortez.
2009-10-12 23:21:32 +01:00
170d2c4660
Merge branch 'master' into htb-throttle
2009-10-12 15:25:42 +01:00
70553a979e
Merge branch 'master' into vehicles
2009-10-12 15:12:15 +01:00
50f509d600
Merge branch 'master' into vehicles
2009-10-12 15:11:01 +01:00
fe0940a22f
Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE enabled, the first Heartbeat loop call to UpdatePhysics takes 20 minutes. 75% of that time is spent in this sleep. (100k prims * 10ms)
2009-10-12 01:53:57 -07:00
ef6aa444bf
Fixed tree crossing. This will alleviate
...
http://opensimulator.org/mantis/view.php?id=4163
2009-10-11 13:46:19 -07:00
36dcfd2b80
* Changed logic of enabling LLProxyLoginModule to follow the new style -- true/false on the name, rather than gridmode=true.
...
* Better error messages on Add/Remove clients.
2009-10-11 10:23:16 -07:00
7b4183d7a0
sync PrimMesher with r46
2009-10-11 02:12:17 -07:00
41b27ef064
disambiguate System.Path (preparation for new PrimMesher)
2009-10-11 01:30:24 -07:00
5e6e31591c
Merge branch 'master' into htb-throttle
...
This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.
2009-10-10 10:26:47 +01:00
ef03b2d936
Fix selling objects
2009-10-10 10:18:16 +01:00
8271528b1f
* comment out the velocity test, using updates every 500 ms as set in ScenePresence.AddToPhysicalScene.
...
* This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms.
* This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update.
2009-10-10 04:01:36 -04:00
3f0dc88c46
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-10-10 03:54:10 -04:00
4ffe936ba8
* Make ODECharacter respect the scene's requested collision update time
...
* Set the Scene collision update time to 500 ms
2009-10-10 03:53:53 -04:00
d7654c3bda
Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for researching this.
2009-10-10 00:26:43 -07:00
5f94889044
* Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This may reduce avatar flailing.
2009-10-10 01:49:06 -04:00
798bce592f
* Move the 'On Collision Update Movement Animation' routine to above the 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway.
2009-10-10 01:16:34 -04:00
3f78ff6ee0
Slight variation on the locking scheme: now locking always, except the ForEach, which gets a copy of the Array. I think the ForEach was the big gorilla.
2009-10-09 19:16:03 -07:00
29543514e6
* Changed the "Packet exceeded buffer size" log line to debug and include the packet type. This message is normal, but could be evidence of a message marked for zerocoding that probably shouldn't be
...
* Changing OpenSimUDPBase back to high concurrency. High concurrency mode seems to make other problems happen faster, so it's helpful for working out other bugs and will probably
2009-10-09 16:33:50 -07:00
c8cc14a98b
This is to *try* to avoid the exception we are seeing repeatedly:
...
#13:53:03 - [LLUDPSERVER]: Packet exceeded buffer size during zerocoding. Removing MSG_ZEROCODED flag
#13:53:03 - [Scene]: Failed with exception System.ArgumentException: Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.
# at System.Buffer.BlockCopy (System.Array src, Int32 srcOffset, System.Array dst, Int32 dstOffset, Int32 count) [0x000b7] in /home/grid/install/mono24/mono-2.4.2.3/mcs/class/corlib/System/Buffer.cs:116
# at OpenSim.Region.ClientStack.LindenUDP.LLUDPServer.SendPacketData (OpenSim.Region.ClientStack.LindenUDP.LLUDPClient client, System.Byte[] data, Int32 dataLength, PacketType type, Boolean doZerocode, ThrottleOutPacketType category) [0x00060] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs:290
# at OpenSim.Region.ClientStack.LindenUDP.LLUDPServer.SendPacket (OpenSim.Region.ClientStack.LindenUDP.LLUDPClient client, OpenMetaverse.Packets.Packet packet, ThrottleOutPacketType category, Boolean allowSplitting) [0x00077] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs:265
# at OpenSim.Region.ClientStack.LindenUDP.LLClientView.OutPacket (OpenMetaverse.Packets.Packet packet, ThrottleOutPacketType throttlePacketType) [0x00000] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs:5244
# at OpenSim.Region.ClientStack.LindenUDP.LLClientView.SendCoarseLocationUpdate (System.Collections.Generic.List`1 users, System.Collections.Generic.List`1 CoarseLocations) [0x0012a] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs:3424
# at OpenSim.Region.Framework.Scenes.ScenePresence.SendCoarseLocationsDefault (UUID sceneId, OpenSim.Region.Framework.Scenes.ScenePresence p) [0x000fa] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2536
# at OpenSim.Region.Framework.Scenes.ScenePresence.SendCoarseLocations () [0x0000d] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2491
# at OpenSim.Region.Framework.Scenes.ScenePresence.Update () [0x00011] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2404
# at OpenSim.Region.Framework.Scenes.SceneGraph.UpdateEntities () [0x0001b] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/SceneGraph.cs:164
# at OpenSim.Region.Framework.Scenes.Scene.Update () [0x000dc] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/Scene.cs:1031 On Region: Wright Plaza
2009-10-09 14:25:01 -07:00
8231cb2231
Putting this to exactly what it was yesterday around this time, so we can do the 100-ppl load test in WP. We need to carefully play with this code in order to understand all the problems.
2009-10-09 11:32:53 -07:00
527c94825b
Merge branch 'master' into htb-throttle
2009-10-09 17:23:18 +01:00
f1f239758f
Apply http://opensimulator.org/mantis/view.php?id=4066
...
If XEngine compile fails, show script name in error message in-world as well as the exception itself
Thanks Luca Peck
2009-10-09 17:43:25 +01:00
b6678faf34
* Apply http://opensimulator.org/mantis/view.php?id=3933
...
* Remove client servers when regions are closed or removed
* Thanks randomhuman!
2009-10-09 17:28:16 +01:00
23586b69a1
Slow down the packet receiving code again after new reports of thread storms.
2009-10-09 12:17:55 +01:00
77e48a6725
Change the backup thread to run on a BackgroundWorker instead of a Thread. I don't have an explanation, but this seems to stop a slow but steady memory leak I was experiencing
2009-10-09 02:49:55 -07:00
76a5cae0b4
Forgot to initialize m_writeLock
2009-10-09 02:18:25 -07:00
a3e31cdeaf
Added more debugging output to the "unrecognized source" warning
2009-10-09 02:13:21 -07:00
494a1e922d
Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet
2009-10-09 02:10:53 -07:00
a5b9971fd7
* Added a lock object for the write functions in LLUDPClientCollection (immutable != concurrent write safety)
...
* Allow the UDP server to bind to a user-specified port again
* Updated to a newer version of OpenSimUDPBase that streamlines the code even more. This also reintroduces the highly concurrent packet handling which needs more testing
2009-10-09 01:53:06 -07:00
56a27c37d3
Simplified LLUDPClientCollection from three collections down to one. This will prevent any potential problems from inconsistency between the internal collections
2009-10-08 21:51:53 -07:00
3a04d706c9
Fear the lockless LLUDP implementation!
2009-10-08 17:34:51 -07:00
51ea39199b
Putting the lock back in TryGetValue.
2009-10-08 15:42:08 -07:00
a0dd9f4bb4
Fork UDPBase from libOMV into opensim
2009-10-08 22:25:14 +01:00
fc41f2e461
Added guards against the exception reported:
...
#2009-10-08 12:58:34,462 ERROR - OpenSim.Application [APPLICATION]:
#APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs
#
#Exception: System.Exception: Object reference not set to an instance of an object. ---> System.NullReferenceException: Object reference not set to an instance of an object.
# at OpenSim.Region.ClientStack.LindenUDP.J2KImage.SendFirstPacket(LLClientView client) in c:\Opensim\OpenSim\Region\ClientStack\LindenUDP\J2KImage.cs:line 230
# at OpenSim.Region.ClientStack.LindenUDP.J2KImage.SendPackets(LLClientView client, Int32 maxpack) in c:\Opensim\OpenSim\Region\ClientStack\LindenUDP\J2KImage.cs:line 84
2009-10-08 07:55:06 -07:00
f6b8bac0fa
Merge branch 'master' into vehicles
2009-10-08 10:32:15 +01:00
68961ec092
One last attempt at tunning the locking/no locking behaviour. The previous one was too lax and made the important login packets fail.
2009-10-07 20:36:24 -07:00
dd80380df5
Another go at the deadlock: not locking TryGetValue, and just catch/ignore exceptions.
2009-10-07 19:45:57 -07:00
c71b3e730d
Changed the locking mechanism, because the existing one is causing deadlocks to occur.
2009-10-07 18:54:08 -07:00
d06c7d90a1
Correct a build break caused by an optimization in trunk
2009-10-07 06:56:00 +01:00
a52f6c56b1
Merge branch 'master' into htb-throttle
2009-10-07 05:19:20 +01:00
d344ca932d
A small change in FetchInventoryDescendantsCAPS.
2009-10-06 22:19:20 -07:00
8c255b374a
Uncommented log message on CAPs FetchInventoryDescendants
2009-10-06 21:32:15 -07:00
d33b6fef2b
replace LLClientView with proper version
2009-10-07 04:37:12 +01:00
adc208e568
Replace LLClientView on the branch with master. UNCOMPILABLE!
2009-10-07 04:36:36 +01:00
58c33fbc89
Uncommented log message on CAPs FetchInventoryDescendants
2009-10-07 04:32:35 +01:00
b5b53dd3eb
* One more debug message on FetchInventoryDescendants
...
* More streams close on finally
2009-10-06 19:55:35 -07:00
6f2d183107
Merge branch 'master' into htb-throttle
2009-10-07 03:01:11 +01:00
89d23a1fa2
Revert "Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed."
...
This reverts commit e992ca0255
2009-10-07 01:45:49 +01:00
9618c196c2
Revert "Merging in diva's locking fixes"
...
This reverts commit 832cc68513
2009-10-07 01:44:36 +01:00
312438f145
Commented noisy debugging about packet splitting
2009-10-06 15:55:39 -07:00
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
7199976d48
Checks the number of ThreadPool and IOCP threads on startup and bumps up the numbers to .NET defaults of 500/1000 if need be
2009-10-06 15:51:56 -07:00
e992ca0255
Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed.
2009-10-06 15:39:53 -07:00
9cb5db3621
Applying the real fix (thank you for tracking that MSDN doc down Melanie)
2009-10-06 15:08:09 -07:00
74fe284a20
Trying Melanie's fix
2009-10-06 14:50:46 -07:00
eb205ef4f0
Added a debug line for nebadon
2009-10-06 14:07:04 -07:00
25676ac5cf
* Added a sanity check for Mono before trying to enumerate over an empty SortedDictionary
...
* Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
2009-10-06 13:39:10 -07:00
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
61b5372153
* Added missing references to prebuild.xml and commented out the LindenUDP tests until a new test harness is written
...
* Clients are no longer disconnected when a packet handler crashes. We'll see how this works out in practice
* Added documentation and cleanup, getting ready for the first public push
* Deleted an old LLUDP file
2009-10-06 12:13:16 -07:00
77b4abaa25
* Removed verbose debug message
...
* Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers
* Fixed a stupid bug in the InventoryConnector which was making move items do things twice
2009-10-06 11:08:11 -07:00
fb19d1ca0a
* Try/catch around EndInvoke() when Util.FireAndForget() returns to catch exceptions thrown in the async method
...
* Added packet stats handling to the new LLUDP implementation
* Attempting to avoid a race condition when creating a new LLUDPClient
2009-10-06 10:12:59 -07:00
3db4d38645
Removing dependencies on System.Runtime.Remoting.
2009-10-06 09:54:15 -07:00
0374f1b144
Merge branch 'master' into vehicles
2009-10-06 17:44:59 +01:00
40d0018d66
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-06 15:29:46 +01:00
d4d060b57d
Commenting the DEBUG code that I added yesterday, because it's causing mono to fail with
...
https://bugzilla.novell.com/show_bug.cgi?id=538854
2009-10-06 07:49:05 -07:00
2a060136bd
Lock the heartbeat against multiple invocations. May prevent deadlocks and/or
...
runaway thread use
2009-10-06 15:28:38 +01:00
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
e7c877407f
* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
...
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
2009-10-06 02:38:00 -07:00
0c46df973a
Correction on the DEBUG code.
2009-10-05 21:02:10 -07:00
e36a54ee2a
#if DEBBUG code for monitoring the ThreadPool.
2009-10-05 20:39:23 -07:00
7ddb6fbced
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-05 17:38:27 -07:00
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
f4726f4bcc
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:52:07 +01:00
90d1ef9e4a
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:52:01 +01:00
d4a6d9191a
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:47:00 +01:00
544675d0f0
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:47:00 +01:00
05c1ec7faf
Changed the lock object, to see if this helps at all. Also switched the order of lock and try/catch in RemoveImageFromQueue.
2009-10-05 11:01:45 -07:00
2a19187e01
* minor: tweak asset cache logging levels downwards
2009-10-05 18:32:19 +01:00
10c4b88ccf
minor: remove mono compile warning
2009-10-05 18:20:37 +01:00
ad81b453b3
GetRegionByPosition: use the cache, Luke.
2009-10-05 09:02:52 -07:00
8d5a40aad0
Merge branch 'master' into vehicles
2009-10-05 12:58:52 +01:00
6d52974c5f
Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions.
2009-10-05 12:45:41 +01:00
dcdcbb314e
Fix build break
2009-10-05 11:08:02 +01:00
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
5c593f3892
only cache mesh if meshing was successful
...
re-enable sculpt mesh caching
2009-10-04 20:01:44 -07:00
362e94a022
* KeepAlive set to false in expect_user and log_off.
...
* Check for null SP in PermissionsModule.
2009-10-04 16:30:12 -07:00
08d3650138
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-04 14:06:28 -07:00
5b19d5a7b7
Reduced locking.
2009-10-04 14:05:58 -07:00
29a4614529
* MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData
...
* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)
2009-10-04 13:57:51 -07:00
d93e0a0503
Guarding a line that is sometimes throwing a null pointer exception.
2009-10-04 10:30:21 -07:00
fe9cca64de
Stream needs to be closed before the file can be moved...
2009-10-04 09:56:54 -07:00
b803d5ab9b
Make sure to close the file streams on the FlotsamCache, even if something fails.
2009-10-04 09:44:04 -07:00
366bfe17ae
Trying to avoid the null pointer exception in J2KImage, RunUpdate.
2009-10-04 07:41:10 -07:00
95ebb7794c
flexible extrusion shape defaults to linear
2009-10-04 02:59:12 -07:00
efebc809ce
disable physics actors for flexible prims
2009-10-04 02:54:36 -07:00
0cbd9eee2f
Exclude sculpt proxies from mesh caching
2009-10-04 02:14:13 -07:00
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
874e423141
Fix my build break
2009-10-03 15:37:31 +01:00
b4d1cf0009
Small permissions tweak
2009-10-03 14:22:29 +01:00
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
332d3eb1bb
* Removed code that is no longer used with Melanie's queue callback optimization
...
* Moved all priority queue access to helper functions to improve reliability and readability
* New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
2009-10-02 16:53:35 -07:00
36c8d55827
Merge branch 'diva-textures-osgrid'
2009-10-03 00:03:09 +01:00
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
bdc1345501
* Removed even more unnecessary state variables from J2KImage
...
* Fixed the incorrect "out of memory?" exception messages and replaced them with useful information
* Cleaned up J2KImage and LLImageManager to conform to coding conventions
2009-10-02 13:08:15 -07:00
9b342d3e0d
* Changed the flush logic to drop packets in non-transactional streams, and to not fire any "put more data in the queues" callbacks
...
* Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
2009-10-02 12:00:42 -07:00
9eccea5777
Merge branch 'master' into vehicles
2009-10-02 19:53:42 +01:00
46955f4260
Merge branch 'master' into vehicles
2009-10-02 19:04:46 +01:00
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
6def897556
Merge branch 'diva-textures-osgrid' into diva-textures
2009-10-02 19:02:38 +01:00
6c068eaf12
reducing script engine log spam
2009-10-02 12:38:13 +02:00
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
3ba36bb4d8
Restore the missing image handling to the image manager. The missing
...
image packet crashes Hippo without a message.
2009-10-02 05:49:27 +01:00
9a429610e2
Merge branch 'diva-textures-osgrid' into texturetest
2009-10-02 04:19:22 +01:00
746dad7b74
Locking the priority queue to see if it gets pass that exception.
2009-10-01 20:32:22 -07:00
18a744cac1
Change texture sending to be driven by the queue empty event from the
...
packet queue, rather than a timer
2009-10-02 04:04:14 +01:00
54ff84050f
Removing console debug spew
2009-10-01 18:12:13 -07:00
a2cdbd784d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-02 10:54:01 +10:00
aaf8fbcef9
Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
2009-10-01 17:53:28 -07:00
a030e3d61b
* Attempting to fix a issue with console commands & the estate module. Again.
2009-10-02 10:53:21 +10:00
6e0c79b8fe
* Rewrote LLImageManager to use a real priority queue and hold minimal state
...
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
2009-10-01 17:42:13 -07:00
24d5b57503
Added messages to assertions in the failing tests, so that we know which ones are failing.
2009-10-01 17:28:42 -07:00
212e132e79
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
...
This reverts commit 39842eb4af
2009-10-02 00:47:01 +01:00
4a1076128c
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-02 00:45:43 +01:00
d6301db382
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
...
This reverts commit 39842eb4af
2009-10-02 00:45:31 +01:00
54a912bb9c
Add a method to determine the count of packets in a throttle
2009-10-01 22:35:57 +01:00
5e9da4daab
Add OnQueueEmpty event to the packet layers. No user functinality yet
2009-10-01 21:08:17 +01:00
d0cc0985fa
Fix a merge conflict
2009-10-01 14:45:06 +01:00
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
44776fea72
Fixing LLClientView memory leak
...
Fixing LLClientView memory leak by disposing of all timers utilized
in LLClientView as they contain references to the callback method.
This required the use of the Terminate and Close infrastructure that
was already in place but was not being utilized.
2009-10-01 04:11:32 +01:00
1eb6f99d19
Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.
2009-09-30 20:27:40 -07:00
8e3dd64282
Removed an innefficent List.Contains lookup from UpdateQueue
...
Changed the underlying data structure used to detected duplicate
in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a
List to a Dictionary.
2009-09-30 17:53:32 -07:00
cb26878f96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 17:51:34 -07:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
5dfd2643df
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
...
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
2009-09-30 15:53:03 -07:00
acfe2d9f4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 15:28:23 -07:00
041aaaa62c
Prevent null data being sent to the decoder
2009-09-30 22:21:22 +01:00
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
67fefdb5a0
Remove predecode-j2k and it's assoaciated logic
2009-09-30 21:33:00 +01:00
b0c0d6f9d1
Squelch the debug noise from diva's patch
2009-09-30 20:36:20 +01:00
f56dc5fcda
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
...
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
2009-09-30 19:26:53 +01:00
f908e32f62
Revert "Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug"
...
This reverts commit 22cc31135e
2009-09-30 19:26:26 +01:00
22cc31135e
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug
...
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
2009-09-30 18:42:45 +01:00
4bf47fa592
This releases the texture assets from LLImageManager cache, and re-requests them later if the client asks for them again. Needs more testing in texture-rich sims.
2009-09-30 18:41:41 +01:00
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02:00
d43f739cef
And another merge issue
2009-09-30 19:05:39 +02:00
11750a272e
And another
2009-09-30 19:04:06 +02:00
6b65eb76d0
Another small change to avoid later merge conflict
2009-09-30 19:01:55 +02:00
53fbc970ca
Small chaneg to adapt to trunk
2009-09-30 18:58:52 +02:00
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
377a8b5229
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-30 11:17:27 +01:00
94aa7e677c
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 09:12:43 +01:00
89016203de
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 16:13:31 -07:00
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
09cb8a594b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-09-29 17:00:02 +02:00
37a8b2b8b7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 07:56:29 -07:00
2a7bedb5e9
This fix addresses the problem where phantom objects do not
...
always behave like they are phantom, and llVolumeDetect
seems to operate in a random fashion.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 16:55:03 +02:00
bc892c1d4c
A little hack to see if this fixes the problems with ~20% of SOG's becoming phantom after an import to megaregions.
2009-09-29 07:54:56 -07:00
a43706862c
Given the perverse way that strided works, if
...
there is only one element in the range, it must
also coincide with the specified stride. The
existing code assumes that the stride starts at
start ( which is the expected and most useful
behavior).
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 15:40:41 +02:00
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
a60ed0562c
I think I have fixed something that was broken in the scene setup (tests) and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
2009-09-28 17:42:35 -07:00
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
4eca59ec13
Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache.
...
Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
2009-09-28 17:33:34 -07:00
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
e15a9b8484
Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing the notifications of the messaging service in standalone.
2009-09-27 17:01:30 -07:00
689eea3bad
Guarding the methods under if (m_Enabled)
2009-09-27 15:06:44 -07:00
2432cc607e
Neighbours cache working.
2009-09-27 13:43:57 -07:00
5d09c53a1a
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
2009-09-27 10:14:10 -07:00
68e40a87ca
Poof! on LocalBackend. CommsManager.GridServices deleted.
2009-09-26 21:29:54 -07:00
620fa2b772
Poof! on OGS1 GridServices.
2009-09-26 21:21:06 -07:00
989382352d
Poof! on Region.Communications.Hypergrid. Grid code deleted.
2009-09-26 21:14:41 -07:00
f4bf581b96
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
...
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
dcfd08b8dd
Fixed a bug with link-region.
2009-09-26 11:01:18 -07:00
b5163889b9
Fixed the order of params to GetRegionRange.
2009-09-26 10:30:45 -07:00
632bb71262
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
...
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
d39e67d5b2
More redirects to HGGridConnector-as-HyperlinkService.
2009-09-26 08:06:14 -07:00
7253a9453e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-26 07:49:04 -07:00
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
a7f3d01f8a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-25 16:06:40 -04:00
2bb513329a
* Does a full battery of tests to ensure that the object isn't an attachment before border crossing
...
* Fixes 'Inconsistent Attachment State' when teleporting into another region besides the SW most region slot on a MegaRegion.
* Fixes a host of other unintended attachment border cross edge cases that lead to Inconsistent attachment state.
2009-09-25 16:06:04 -04:00
fb2cabd6b3
corrections to viewerMode AddPos()
2009-09-25 13:01:48 -07:00
0a0b532270
* Fixes teleporting within megaregions on HG enabled regions. You can teleport around now. (but it still doesn't fix the inconsistent attachment state when teleporting into region slots that are not the south west region on megaregions)
2009-09-25 15:31:19 -04:00
0bdf75637f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-25 19:19:01 +01:00
eed8a61559
More small changes to FlotsamAssetCache as per mcortez' request.
2009-09-25 08:47:45 -07:00
902279f0fd
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 08:39:09 -07:00
9249c026f2
Don't preserve full user profile details within iars for now
...
This information was not being used in the load process
2009-09-25 16:22:43 +01:00
613cb417c0
add control files containing version info to iars
2009-09-25 14:52:53 +01:00
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
1b2828f5d8
Meshmerizer stores dictionary of unique Meshes keyed on construction parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE
...
Signed-off-by: dahlia <dahliaTrimble@gmailDotCom>
2009-09-24 18:20:59 -07:00
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
e1abc3d4c4
re-enable registration of user service authentication method I accidentally disabled a few commits ago
...
load/save iar on a grid should now work, provided that the user service is this revision or newer
2009-09-24 15:22:47 +01:00
f62b5e6cec
Produce a different error message if the user service does not have the authenticate method available
2009-09-24 15:19:47 +01:00
7870152d23
Allow load/save iar password checks to be done in grid mode
...
This should allow load/save iar to work for grid mode as long as the grid user service is later than this revision
Grid services of earlier revisions will always erroneously report incorrect password. This will be addressed shortly.
2009-09-24 14:54:12 +01:00
ca69fac13e
* Send Updated Information Packet to Clients after updating estate settings.
2009-09-24 22:02:29 +10:00
8605c5d2eb
* Establishing why new console commands fail to work. >_>
2009-09-24 21:46:41 +10:00
57429423bb
* Fixing typo.
2009-09-24 21:29:57 +10:00
aca9fd182e
* Added two new commands to EstateManagementModule
...
* Also, I hate git.
2009-09-24 20:27:11 +10:00
1260c81a9c
More tests. Seems to be working.
...
Grid connector modules are enabled for standalones only, but nothing in the simulator uses them yet, so it's safe to go in.
2009-09-23 20:51:04 -07:00
fd8fb7735b
First test passes -- regions being registered and retrieved correctly in Data.Null.
2009-09-23 20:39:25 -07:00
3c19bd5142
Unit tests for the grid service. Yey!
2009-09-23 20:35:16 -07:00
67276589c8
Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
...
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
c592a60f46
Fix endlines on UrlModule.cs
2009-09-23 15:00:18 -04:00
9c2ffa8f2e
* fix endlines in LSL_api.cs
2009-09-23 14:55:22 -04:00
35deff7ec4
Modules active. Tested HGGridConnector in standalone only for now. Modules commands work.
2009-09-23 09:27:01 -07:00
486a9a5b61
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 07:54:13 -07:00
b7265abfae
Added delay loop to give a newly created assembly time to appear. On
...
Linux (as an example), it is possible for the existence check to fail
because the file is not yet recognized by the file system. Although
the loop has a 250mS delay, in practise, the existence test in the for
loop is successful and no delay is introduced.
Next, this takes care of the two, unpredictable, situations where a
script fails to compile. The first is caused by an occasional SEGV in
the underlying mono VM while mcs is running, the second is caused by
file system latency.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-23 14:49:34 +02:00
882d2c9cc3
Added hg console commands to the module.
...
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
5dc3e560d3
* Makes SimulatorEnable messages 'reliable' and subject to redelivery.
2009-09-23 10:30:18 +10:00
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
0fc2b73e7b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-22 14:15:53 -07:00
34f4738159
Added HGGridConnector and related code.
2009-09-22 11:58:40 -07:00
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
a9ced0fe79
Added Remote grid connector module.
2009-09-21 19:33:56 -07:00
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
5511c62580
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-21 18:12:12 +01:00
6d0e7b6a6c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-21 11:05:20 -07:00
390137d540
Added grid handler and grid remote connector.
2009-09-21 11:05:01 -07:00
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
d835485a1f
Updatate llOpenRemoteDataChannel to provide the external hostname configured in the Regions.ini (or xml) to the XmlRpcGridRouterModule
2009-09-19 08:16:10 +01:00
66f8166bd0
First pass at LocalGridServiceConnector. Nothing of this is used by the simulator yet.
2009-09-18 20:01:33 -07:00
967cbde055
correct off-by-one error in save iar command handling
2009-09-18 22:25:32 +01:00
33ea86374a
provide intelligble warning of why load/save iar doesn't work on grid mode, pending a fix
2009-09-18 22:22:00 +01:00
4eb07232e0
Group Membership information is sent out from two different locations, refactored out the filtered membership list code and used it in both locations.
2009-09-18 20:54:03 +01:00
65b9084c65
Add a little debugging for filtered groups lists based on requester
2009-09-18 20:54:01 +01:00
3b511d5138
Try to filter the groups list returns for User A, when sending to User B, based on User A's preferences for ShowInProfile.
2009-09-18 20:53:58 +01:00
247fdd1a4d
Add additional instrumentation so that when there is an xmlrpc call failure, the actual xml that was returned from the groups service can be logged.
2009-09-18 20:53:56 +01:00
841cd69af7
Remove debug messages from some areas that have been highly tested, and debug info is no longer nessesary.
2009-09-18 20:53:53 +01:00
0e07a7ef10
Adding additional debug to output the group powers specified when updating a group role. This will be used to solve some issues with the Group Powers enum.
2009-09-18 20:53:50 +01:00
61699275ed
Add additional debugging to help track down bug with notices not going to group owner/founder.
2009-09-18 20:53:47 +01:00
0cb012aae5
Revert "Thank you, mcortez, for a patch to address showing users in group list"
...
This reverts commit 69ef95693a
2009-09-18 20:53:44 +01:00
4f3975f04e
addition of a new script function osSetParcelSIPAddress(string SIPAddress), now including iVoiceModule
...
This patch allows the land owner to dynamically set the SIP address of a particular land parcel from script. This allows predetermined SIP addresses to be used, making it easier to allow non OpenSim users to join a regions voice channel.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-18 15:47:15 +02:00
56edbe9b60
Alternate algorithm for fixing avatar capsule tilt (Mantis #2905 )
...
Eliminate dynamic capsule wobble. Instead introduce a small, fixed
tilt, and allow the tilt to rotate with the avatar while moving; the
tilt always faces away from the direction of avatar movement. The
rotation while moving should eliminate direction-dependent behavior
(e.g. only being able to climb on top of prims from certain directions).
Falling animation is still too frequently invoked.
Ideally the tilt should be completely eliminated, but doing so
currently causes the avatar to fall through the terrain.
2009-09-18 11:39:08 +09:00
88294d9ebf
While running a test case I had written to pursue problems with
...
llDie() not always completely working, I discovered I was
getting a lot (60+ over 6000 iterations of the test case)
null pointer exceptions in various physics related checks in
SceneObjectPart. It was apparent that the (frequent) checks for
PhysActor being non-null is an insufficient protection in a
highly asynchronous environment. The null reference exceptions
are one example of failure, but it could also happen that a
sequence started with one instance of a PhysicsActor might
finish with another?
Anyway, I have implemented a safer mechanism that should
stop the errors. I re-ran my test case with the fix in place,
and completed nearly 1000 iterations without a single occurrence.
SceneObjectPart is seriously in need of rejigging, if not for
this reason, then for its ridiculous size.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-17 17:49:13 +02:00
69ef95693a
Thank you, mcortez, for a patch to address showing users in group list
...
Removed patch 0005, which was unrelated and likely accidental, and further
didn't apply.
2009-09-17 15:38:17 +01:00
39842eb4af
* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity
2009-09-16 17:17:40 -07:00
f42d085ab1
SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart
2009-09-16 15:06:08 -07:00
077d01c225
switch default physics engine to ODE and default meshmerizer to Meshmerizer in code and in OpenSim.ini.example
2009-09-16 18:44:55 +01:00
a4c093469a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-16 18:21:46 +01:00
35260faead
on iar save/load, let the user know if they put in the wrong password
...
refactor GetUserInfo() to eliminate copypasta
2009-09-16 18:20:55 +01:00
281ad1251c
updated the IAuthorizationService interface so that a message is passed back and can be displayed at the client when an avatar is denied access to a region
2009-09-16 10:04:07 -07:00
9cbb865985
This fix allows you to configure a script-to-console-log channel
...
association. Then, whenever there is an llSay to that channel,
the message is directed to the OpenSim console log (and NOT
forwarded to the client). This is a great way to capture scripting
events to the log. To enable, add ScriptConsoleChannel = -xxx to
the ScriptEngine parameters in the .ini file. Note that the
message is written using Console.WriteLine rather than
the rather more fragile log4net service. The console channel is
also not subjected to the 1024 character limit imposed on regular
say traffic.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-16 17:07:53 +02:00
3b1ef2bfd2
This fixes a boundary case error in the strided list
...
implementation. If the range included only a single item
an empty list was always returned (has no-one been using
this function?)
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-16 16:38:29 +02:00
3403ae81e8
Stop a loaded OAR from generating on_rez events. This brings
...
the OAR loader in line with region restart (and the correct
behavior).
2009-09-16 16:29:52 +02:00
c5455d4fe7
And another go
2009-09-15 08:24:51 +01:00
cec296543c
Attempt to fix the tests
2009-09-15 08:12:53 +01:00
7c925744f6
Some OSGrid specific changes, please use this or later for OSGrid use
2009-09-15 07:55:29 +01:00
1ad35f65b3
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-14 16:30:36 -04:00
dc925416d7
* fix missing lock on XMLRPC GroupsModule
2009-09-14 16:30:14 -04:00
a964bc3ca4
Apply http://opensimulator.org/mantis/view.php?id=4142
...
Re-enable XMLRPC scripting calls
Moves XMLRPC scripting setup to a separate section
Thanks Fly-Man-
2009-09-14 18:31:34 +01:00
5a64ca4642
label load and save iar commands as experimental.
2009-09-14 16:57:47 +01:00
dd4d70eafe
re-enable load and save iar commands
2009-09-14 16:54:36 +01:00
19c5c8b98d
fix to preserve UTF8 encoding in saved script state.
2009-09-14 16:14:59 +02:00
feccfe4096
* Add the RegionCombinerModule back
...
* Yay anonymous delegate in an anonymous delegate.
2009-09-13 19:09:48 -04:00
3a9e1cf0a3
Temporarily removing the RegionCombinerModule to debug a mono assert on linux
2009-09-13 18:43:20 -04:00
ed475f21ee
* Use the BeginInvoke methodology instead of the FireAndForget methodology to try to mitigate a mono assert. Same functionality done a different way.
2009-09-13 18:28:45 -04:00
3562d75c17
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 18:12:44 -04:00
eadea36142
* Move nested classes from the RegionCombinerModule into their own file.
...
* Rename the RegionCombinerModuleIndividualForwarder to RegionCombinerIndividualEventForwarder so there's no possibility that mono.addins sees any names similar
2009-09-13 18:12:24 -04:00
efc43aa0d9
Change the type value for given folders to -1. Prevents inventory blowups
2009-09-13 18:24:00 +01:00
fe4f312d55
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 07:28:08 -04:00
4241cdc929
* More comments in the RegionCombinerModule
...
* Changed the Destination ID to 0 in the TeleportFinish Event (why did we have it as 3?)
* Added border based trigger teleports
* Fix MakeRootAgent border cross tests for ensuring that the position is inside the region to use the borders to figure out if it's outside the Region
2009-09-13 07:20:18 -04:00
01ec93945e
Formatting cleanup.
2009-09-13 13:56:09 +09:00
40c3ac4aeb
Guarding the unpacking of the email field introduced by Robsmart. Most profiles don't have it. This may fix mantis #4134 .
2009-09-12 09:30:14 -07:00
496b368334
Add a using() block around the timer script
2009-09-11 21:52:49 +01:00
c573a32529
Disable non-user ready load/save iar for now pending possible format change
2009-09-11 20:38:08 +01:00
f20a052ef5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-11 18:20:41 +01:00
212efc0c76
Remove bug where iar created folders could not be deleted after relog
...
New folders need to be created with AssetType.Unknown rather than AssetType.Folder!
2009-09-11 16:51:57 +01:00
ca0810a103
Minor indentation cleanup.
2009-09-11 06:59:10 -07:00
eaec7cf39c
Changed RemoteAuthorizationServiceConnector so that it implements the IAuthorization interface method isAuthorizedForRegion looks up user and region data and delegates the remote authorization check to the AuthorizationServiceConnector
...
This keeps the IAuthorization as clean as possible and moves the dependency of using a UserProfileData object out to the connector from the scene.
2009-09-11 06:50:24 -07:00
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
953ef780c5
adding in working functionality for the remote connector
2009-09-10 17:52:42 -07:00
16940097be
The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested.
2009-09-10 17:51:28 -07:00
552ba5334f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-10 18:14:34 +01:00
eabf5b6c3d
refactor: Replace some iar item name generation in tests with helper function
2009-09-10 17:40:07 +01:00
f5feb25dd1
fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0
2009-09-10 17:08:26 +01:00
729fbee287
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 04:07:08 -04:00
1c878ec425
* Fix an off by one error on visible neighbors in the 'RequestNeighbors' method. This off by one error showed one extra row of neighbors on the north and east side
2009-09-10 03:25:55 -04:00
c41387b864
Formatting cleanup.
2009-09-10 15:57:53 +09:00
dc3798ddc3
* Another Timer lock
2009-09-10 00:31:14 -04:00
df9f80aabd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-09 16:20:46 -04:00
c605509da3
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
2009-09-09 16:20:19 -04:00
5bf288745d
De-hardcode default home locations on create user (standalone).
2009-09-09 11:02:31 -07:00
0cdec1fbc3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-09 18:11:02 +01:00
bb1f64fe51
minor: suppress mono warning 0162 generated when comparing const RegionSize against a literal number
2009-09-09 18:09:23 +01:00
0683cf6e0d
Add test to check behaviour if an iar is loaded where no user profile exists for the creators
...
Disable generation of temporary profiles for now, instead record loading user as creator
2009-09-09 18:03:49 +01:00
62358014ed
reformatting.
2009-09-09 09:56:07 +02:00
d8a787bd89
fix: unicode notecards not surviving script treatment ( fixes #4119 ---
...
perhaps).
2009-09-09 09:56:07 +02:00
5c606d0233
Thank you, mcortez, for a patch to fix errors in FlotsamCache and expand
...
functionality, adding console commands.
2009-09-08 21:31:09 +01:00
2bb2a0ec44
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-08 17:50:45 +01:00
b7256f2567
extend load iar test to loading into a deeply nested directory
...
correct bug associated with this
2009-09-08 17:42:07 +01:00
36a40e0295
refactor: change method argument name
2009-09-08 16:29:31 +01:00
46d64da830
minor: remove warning
2009-09-08 16:14:52 +01:00
76b21860e9
refactor iar name generation
...
slightly change the format of item archive names
2009-09-08 16:12:15 +01:00
f0e2fd426b
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-08 04:43:17 -04:00
9a06056c9a
* Fixes a 'take object from mega region' and rez it in a regular region.. and have it appear 5 regions over bug by limiting the stored position in the asset to Constants.RegionSize. The stored position in the asset gets overwritten anyway by the rezzing routine, but at least this way, there's no chance of the objects border crossing before the rezzing routine finishes.
2009-09-08 04:43:00 -04:00
665cf0194a
llRot2Euler() now returns angles -PI < angle < PI
2009-09-07 18:02:02 -07:00
7a67b726d5
random drive-by maths optimization in llRot2Euler() and llEuler2Rot()
2009-09-07 17:12:17 -07:00
fa1d79533e
Only allow iar load/save if user is logged in to the region simulator
2009-09-07 19:57:44 +01:00
71f1628578
make oar module logging a little less noisy
2009-09-07 19:11:16 +01:00
10b075a33d
change default iar filename
2009-09-07 18:42:53 +01:00
116933bee5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-07 18:26:53 +01:00
326c3ee14f
* Enables Child Agents for all virtual regions in the region and their neighbors. There still may be issues with crossing into the mentioned neighbors of the virtual regions. This makes regions larger then 512x512 (3 virtual regions) display fully to clients.
...
* Uses a grid request multiple times, so the more regions are in the instance, the longer logging in takes. Consider this temporary until there's a RegionInfo request similar to the MapItem Request.
2009-09-07 12:57:30 -04:00
c4edefd9a0
minor: organizational
...
* Move the neighbor region lookup to another method from where it was before in EnableNeighbourChildAgents.
2009-09-06 21:26:59 -04:00
61c286f5d6
change iar load to make discrete inventory service requests rather than the cache
2009-09-06 22:07:35 +01:00
5640cac8e0
Add convenience functions to InventoryArchiveUtils for locating folders by assuming we're starting from the root
...
Change test methods to use convenience functions
2009-09-06 21:34:20 +01:00
a92afe8dca
change load iar test to use non-cache find item by path function
2009-09-06 21:26:27 +01:00
d8316810a1
remove now unnecessary parts of save iar test
2009-09-06 21:20:41 +01:00
8797a82098
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-06 16:15:20 -04:00
1cc0c94f79
remove warning
2009-09-06 21:15:18 +01:00
511bddc8bc
* Moves another Legacy avatar inbounds check to Border
2009-09-06 16:15:06 -04:00
881051c8cc
Convert iar write request to use inventory service requests rather than cache
2009-09-06 21:14:42 +01:00
766d775625
remove warning
2009-09-06 20:17:30 +01:00
79c22651d7
refactor: use direct scene reference in inventory archive read request
2009-09-06 20:16:56 +01:00
8616230fcf
refactor: replace some uses of iar module reference with scene instead
2009-09-06 20:04:18 +01:00
304c78bbbb
Temporarily re-enable save iar test by manually insert the item into the old cache during the test
2009-09-06 19:30:03 +01:00
998624544c
Addendum to last commit. With the last commit, some other code that should
...
have been in this commit slipped in. If the last heartbeat is more than
2 seconds ago, kill that thread and start a new one. Untested.
his commit adds support to let the first heartbeat complete unconditionally,
since it is almost always longer.
2009-09-06 16:14:45 +01:00
dcebbc3f1b
Remove the encryption from the IAuthenticationService interface. That
...
is too high up for that type of stuff. It needs to be at the
connector/handler level
2009-09-06 15:55:14 +01:00
2303945b4e
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-06 04:29:21 +01:00
2a8f66b221
Revising the user account data interfaces. No user functionality yet
2009-09-06 04:28:42 +01:00
babe392709
uh-hum. It might help if I remembered to save the file.
2009-09-05 17:16:43 -07:00
7d9d8eb90f
This should get rid of the infinite loop upon looking up users/agents by UUID in grid mode. Grr.
2009-09-05 16:56:33 -07:00
8855c2e54c
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-05 03:00:50 -04:00
855fb58c96
* Moves ScenePresence SendCourseLocations to a delegate and provide a method to replace the delegate
...
* RegionCombinerModule replaces this delegate and distributes the CoarseLocationUpdates through the client connection in the region where the user would be if it was a separate region.
* Fixes Mini Map display on combined regions.
2009-09-05 02:58:35 -04:00
b6744a6566
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-04 22:31:10 -07:00
c48ec97817
Fixed some long-standing issues with appearance in HG1.
2009-09-04 22:30:30 -07:00
2c09634aed
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-04 20:19:50 -04:00
016a648a30
* Fixes various quirks rezzing in virtual regions.
...
* Breaks up the Client event registrations in Scene into methods of similar event types. The generic event registration registers all of the event types.
*Created symmetrical Un-Registration methods.
* Made the Registration and Unregistration methods public
* Hooks The events required for creating new prim and rezzing new prim into the proper scene.
2009-09-04 20:19:34 -04:00
7ca61e0174
Add ids to iar requests
...
Stop save iar test wrongly relying on thread pulsing (still disabled though)
2009-09-04 21:10:56 +01:00
4c560df8ac
If running tests manually, fail immediately on error
2009-09-04 19:22:09 +01:00
50a9e01dfa
* Last commit was a bit of a fail, it registered the root region for it's own permissions events again.
...
* This commit fixes that and does what the last one intended.
2009-09-04 04:41:43 -04:00
f7861a6bad
* Make the RegionCombinerModule also register to handle permissions for the virtual region scenes.
2009-09-04 04:25:56 -04:00
b93f512433
* Fix for GetTerrainHeightAtXY to make it compatible when Constants.RegionSize isn't 256
2009-09-04 02:48:07 -04:00
bb5857c4bb
* Fixes the function 'GetTerrainHeightAtXY'
2009-09-04 00:03:54 -04:00
639bf79aec
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-03 12:42:25 -07:00
33133e23b1
Fixes seven leaky .BeginInvoke() calls
2009-09-03 12:36:51 -07:00
64fa23df7c
If a test dll fails, stop immediately rather than trying all the other test dlls
...
This is very useful behaviour if debugging test failures otherwise it's hard to pick out the test output
Also, some minor method shuffling in the iar module
2009-09-03 19:41:38 +01:00
6cf610bc44
eliminate unnecessary storage of mesh objects which are no longer necessary after recent startup optimizations
2009-09-02 17:40:55 -07:00
56ddd6828c
Add copyright headers. Formatting cleanup.
2009-09-03 02:04:17 +09:00
bb0cbdc064
switching LandManagementModule to "new" region module scheme; cleaning
...
up method names in LandManagementModule (was a bit of a
mess). suppressing warnings re Constants.RegionSize.
2009-09-02 11:06:18 +02:00
05756e1fb9
warnings safari.
2009-09-02 11:06:18 +02:00
9505297fb1
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
...
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
2009-09-02 04:39:00 -04:00
f32de6fe88
Thank you, dslake, for a set of patches to improve OpenSim startup
...
and idle performance.
2009-09-02 03:33:31 +01:00
2fc3f61a42
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-01 19:39:07 -04:00
afc72cc10e
* Fixes diagonal teleporting when in RegionCombining mode by adding 4 additional borders that have infinite distances perpendicular to the cardinal of the border surrounding the entire combined region. Recalculates this boundary each time AddScene is called.
2009-09-01 19:38:45 -04:00
39726f0fda
switching SerialiserModule to "new" region module scheme
2009-09-01 10:28:29 +02:00
ef6c0bd7d8
cleanup.
2009-09-01 10:28:29 +02:00
2245e2977e
* The return of fuzzy borders!
2009-08-31 23:16:24 -04:00
3718bbc6a5
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-31 22:51:03 -04:00
c09884a467
No more fuzzy borders
2009-08-31 22:50:27 -04:00
2068b6714a
* -2 on the south and west side, -1 on the north and east side. Fuzzy borders! yay
2009-08-31 21:40:06 -04:00
c89fc36f28
Applying Mantis #4079 . Thank you, dslake
2009-09-01 02:17:08 +01:00
de1c2a51e2
* Put Borders back the way they were to resolve the endless ----> crossing into region X,Y
2009-08-31 21:11:04 -04:00
29df190a3f
Baad git, baad baad git.
2009-09-01 02:02:52 +01:00
22457c9843
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-01 01:56:59 +01:00
e458a87e91
Experimental. Set attachment flag early on rezzing from inventory.
2009-09-01 01:53:54 +01:00
fed089971e
* Previously south and west border were required to be -1 for border crossings diagonally to work.. but.. seems they're working now without it.. and maybe it will help attachments.
2009-08-31 20:36:06 -04:00
b8d21d9eae
* Get rid of some debug info and kill the code to make a large AABB until I can figure out how to detect the fact that the system is done starting up new regions.
2009-08-31 20:10:08 -04:00
b997174d08
* Fix attachment cross issues with new borders.
2009-08-31 20:07:33 -04:00
895c612647
* When the RegionCombinerModule is active add an extra set of borders with Infinite distances around the whole AABB of the region
2009-08-31 16:29:27 -04:00
27b378ca8b
switching Archiver to "new" region module scheme
2009-08-31 17:25:16 +02:00
3581b9abce
Merge branch 'regionready' into opensim
2009-08-31 15:02:21 +02:00
3195af39a7
cleaning up RegionReadyModule:
...
- wrong namespace
- converted to "new" region module
2009-08-31 14:59:28 +02:00
9e6684661a
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-31 11:58:49 +01:00
090868ff4a
Change the return value if the compiler to "object" to allow compilers
...
to return dynamic method objects
2009-08-31 11:42:54 +01:00
5209305615
oops. fixing missing argument.
2009-08-31 12:05:14 +02:00
86521adb7e
adding log message to vector render to inform about default font being used
2009-08-31 11:35:49 +02:00
953581698d
- making font name used by VectorRenderModule configurable: can be set
...
via
[VectorRender]
font_name = "Comic Sans MS"
in OpenSim.ini
- adding osSetFontName OSSL function
2009-08-31 10:30:10 +02:00
bbef5c344e
Remove typo version of ReplaceableInterface property from RegionCombinerModule.
2009-08-31 14:16:16 +09:00
9f2f3afe22
* Fixes a teleport issue when teleporting out of a region to a different one.
2009-08-30 02:49:50 -04:00
d4dd179547
* whoops, forgot the other class initializer.
2009-08-30 00:29:43 -04:00
59c8a02a24
* When the RegionCombinerModule is off, make borders have an infinite aabb perpendicular to the cardinal
2009-08-30 00:22:38 -04:00
2f40161f38
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-29 23:50:24 -04:00
efe737b895
Ok, merging the RegionCombinerModule with master.
2009-08-29 23:49:48 -04:00
33f36c9010
* Rename the RegionCombiner Module from PhysicsCombiner
2009-08-29 23:39:27 -04:00
44b7c39c93
* Fix the reason why physical vehicles have a problem in virtual regions.
2009-08-29 21:47:28 -04:00
3ccf3aba89
* Fixes looking up parcel permissions in virtual regions.
2009-08-29 16:24:03 -04:00
d45f871d8f
* Only lock the Borders when they're being changed, otherwise one avatar's movement could hinder another avatar's movement.
2009-08-29 03:36:41 -04:00
1a6b30e092
Add a slow cache cleaner thread. By default, the thread starts a cleanup
...
sweep every 10 minutes. If any texture data is older than 12 hours, it is
regenerated and the memory cache is refreshed. After each decode, the thread
delays for 5 seconds.
2009-08-29 05:54:38 +01:00
2a5b9f7740
the beginning of some changes to the decode cache to address concerns about
...
system load. This commit effectively disables expiration.
2009-08-29 05:29:54 +01:00
4b2e62fd3c
Make the j2kDecodeCache expire after 50 minutes (configurable). Alse allows
...
setting the path for it. This commit introduces NEW DEFAULT BEHAVIOR. To
retain the old behavior (eternal cache) you will need to change your OpenSim.ini
and set the timeout to 0.
2009-08-29 04:35:18 +01:00
976cf4284b
Fix up WebFetchInventoryDescendents to really return all data needed,
...
especially the folder version and the subfolders. Fixes inventory search
hang and folders not loading.
2009-08-29 03:26:44 +01:00
9eb8c14e87
* Deal with teleports to other virtual regions in the same scene.
2009-08-28 19:42:28 -04:00
22a0dff226
Modify CAPS inventory code. Currently this is not executed
2009-08-28 23:28:32 +01:00
3d6edc04a3
Implements osDrawPolygon, similar to already implemented osDrawFilledPolygon
2009-08-28 17:48:03 -03:00
ac718843d9
* Allow corner prim crossings. Previously this was only on a single cardinal direction
...
* Some leg work in getting avatar teleports into 'virtual regions' moved to the proper region.
2009-08-28 14:45:17 -04:00
33004b613d
Standardize FlotsamAssetCache header
...
Add mcortez to CONTRIBUTORS
Other minor tidy of CONTRIBUTORS
2009-08-28 18:12:30 +01:00
18c5dc0953
Try to cache system folders if they aren't already there when one is requested
...
This operation can be performed legitimately on standalones without a logged in user
2009-08-28 17:19:45 +01:00
7ff4c2e50b
Pull out distinct cache system folders and drop cache methods in InventoryCache
2009-08-28 17:07:17 +01:00
7f8df4242b
Correct build break
2009-08-28 12:58:10 +01:00
d649194be3
minor: formatting and comments
2009-08-28 12:52:40 +01:00
cf58c0ab08
minor: remove some commented out iar test code
2009-08-28 12:01:21 +01:00
65dda8a795
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-27 19:36:52 -04:00
d704e62b39
Remove OpenSim.ini comments from the top of FlotsamAssetCache.cs to avoid duplication and divergence with config-include/FlotsamCache.ini.example
2009-08-27 21:49:32 +01:00
40fbdaaac4
Apply http://opensimulator.org/mantis/view.php?id=3829
...
Fix file access violation on Flotsam cache
Thanks mcortez
2009-08-27 21:25:16 +01:00
6f077d5e5f
* Another attempt at fixing the random spurious test error.
...
* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that.
2009-08-26 21:05:46 -04:00
54e05a083d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-26 11:48:05 -04:00
cf2d1b5c10
Add copy constructor to PhysicsVector.
2009-08-26 14:28:54 +09:00
256624566f
Formatting cleanup, minor refactoring.
2009-08-26 14:02:01 +09:00
efb287f28f
Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using arrow, diamond, round and flat caps.
...
* Made image request safer, if it can't find an image for any reason, draws a square where the image should be and a message alerting the user.
2009-08-25 10:32:45 -03:00
9c9fa51b0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
2009-08-25 10:28:22 -03:00
b03eeeb9f6
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044 . Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
...
* Removed left-overs from AssetInventoryServer.
2009-08-22 10:24:26 -07:00
7923fd29a0
Adds osDrawPolygon to OSSL. Works a little different then other OS Drawing functions, this one has no start and end point, but a number of points that will form the desired polygon. Only FilledPolygon implemented so far.
...
* Also added some LSL transparent type conversion, as it's done in LSL scripting (string to integer, float to string, etc)
2009-08-21 21:12:22 -03:00
e1b38ff001
* It turns out that Physics heightmap values were being stored in managed memory in _heightmap and using multiple heightmaps caused them all to overwrite each other and the last one was the heightmap for all of the regions. This fixes that. It also reduces the terrain resolution to half.
2009-08-21 13:22:49 -04:00
158ad39df0
Add copyright header. Formatting cleanup.
2009-08-21 15:47:55 +09:00
31e7e1b5f9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 22:37:06 -07:00
e4f64dd714
Made HandleFetchInventoryDescendents async, so that the client thread doesn't wait for the download of the entire inventory.
2009-08-20 22:36:47 -07:00
bd7757de22
* oops. Mistake with value return.
2009-08-21 15:15:15 +10:00
f7c5eca978
* Moves NPC Creation across AppDomains to prevent a major perfomance issue.
2009-08-21 15:12:50 +10:00
9e64427262
Putting the inventory packets back to ThrottleOutPacketType.Asset, because that didn't work.
2009-08-20 21:56:06 -07:00
922007443e
Changed most of inventory packets to LowPriority, to see if that helps with freezing on searching large inventories.
2009-08-20 21:36:57 -07:00
98da8e9b16
* Make cache, actually cache.
2009-08-21 14:20:05 +10:00
29e2067ec3
* Implements a cache in NPCModule for Appearance.
2009-08-21 14:10:21 +10:00
25dbf16cfb
* Once more into the breach!
2009-08-21 13:44:20 +10:00
d4600eec4d
* Attempting to diagnose a connection bug.
2009-08-21 13:35:13 +10:00
64dcb71c14
* Fixes Terrain issues with combined regions.
2009-08-20 23:26:40 -04:00
c9b52cd0b6
* Adds PhysicsCombiner Module
...
* May rename this later
2009-08-20 23:25:40 -04:00
bce98f9670
* Fixing an issue with NPC's and Circuit Codes.
2009-08-21 13:12:51 +10:00
7ef3e5f41c
* Protip: Declare publically accessible functions, as public functions.
2009-08-21 11:43:45 +10:00
c7e140171e
* Addendum to previous
2009-08-21 11:35:19 +10:00
1740fd60b3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-21 11:15:48 +10:00
01f394d203
* Fleshes more of NPCModule out.
...
* Implements some OSSL commands:
key osNpcCreate(string user, string name, vector position, key cloneFrom);
void osNpcMoveTo(key npc, vector position);
void osNpcSay(key npc, string message);
void osNpcRemove(key npc);
* Untested. Requires ThreatLevel.High.
2009-08-21 11:14:55 +10:00
181b992b4a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-20 19:25:52 -04:00
b8d7663f54
* Deal with git thinking that file was changed even though it wasn't and it's blocking a pull
2009-08-20 19:25:37 -04:00
66c40dd3de
* Switch border cross tests over to the new Border class.
...
* Use List<Border> for each cardinal to allow for irregular regions.
2009-08-20 19:24:31 -04:00
a3d895908f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 16:19:02 -07:00
118f710a79
Fixed a missing field in SendBulkInventoryFolderUpdate.
2009-08-20 16:18:32 -07:00
e83b00a3df
* Implements a bunch of stuff in NPCModule
2009-08-21 08:51:43 +10:00
297393f349
Remove a load-order dependency in inventory transfer that was biting
...
Windows users
2009-08-20 21:05:00 +01:00
4c8bcd2ff6
Add some output (at DEBUG level) to the message transfer module to aid
...
in tracking down an initialization failure.
2009-08-20 20:19:08 +01:00
1604c9d19e
One more place fixed for setting the inventory folder owner. Thanks jhurliman.
2009-08-20 10:14:53 -07:00
948c7ea20b
Commented T021_TestCrossToNewRegion because (1) it can fail on panda, and (2) it is not a meaningful representation of region crossing.
2009-08-19 18:08:20 -07:00
6e35ddb0e9
Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in SQlite. Fixes most grief in
...
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 17:35:42 -07:00
289439c832
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-19 14:43:18 -04:00
de543002aa
Add Border (a virtual border management class)
...
Move Cardinals to it's own file.
2009-08-19 14:43:03 -04:00
d519f1885f
Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently).
2009-08-19 10:56:08 -07:00
4382f28efc
Async purge so that the client thread doesn't wait.
2009-08-19 00:33:02 -07:00
4818d11b9d
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 00:31:51 -07:00
c5af39239f
A better purge of trash folder.
2009-08-19 00:13:51 -07:00
e5f33e7505
GetFolderItems implemented. It's not being called, but it might.
2009-08-18 22:36:03 -07:00
124f66bfc2
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
2009-08-18 22:17:47 -07:00
32cc00ec7b
osGetLinkPrimitiveParams fix
2009-08-18 20:05:27 -07:00
465d1095dd
Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user's viewer network throttle settings
2009-08-18 17:06:14 -07:00
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
c54cb59a71
* Some Physics Scene Changes to prepare for larger regions
2009-08-18 11:05:07 -04:00
d95d3b949b
Fixes mantis #4020 ( http://opensimulator.org/mantis/view.php?id=4020 )
2009-08-18 07:05:22 -07:00
89cd8a99ed
Commented 2 tests in ScenePresenceTests, one because things were being done in the wrong order, and the other because it NEEDS the inventory service set up. Test-writers, please please please do the scene setup properly EVERYWHERE. It's close to impossible to rely on tests that don't setup resource service references!
2009-08-17 18:52:10 -07:00
d7aa622050
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 15:28:16 -07:00
df889855ec
Commented out one IAR test, because it's failing and needs attention from justincc or arthursv. I think the mock inventory service needs a little bit more beef.
2009-08-17 15:16:21 -07:00
9ad3e72ae1
Did I say that i don't like git? Remove some stuff that shouldn't have
...
gone in.
2009-08-17 22:06:51 +01:00
59b4cf2d5b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 13:27:22 -07:00
0d7bcee560
no-op to poke panda
2009-08-17 20:25:14 +01:00
eb78ac343e
Apply http://opensimulator.org/mantis/view.php?id=3538
...
Add ability to silence IRC relay of region joins and quits from certain users
This is useful for admins who wish to remain hidden, or service bots.
Thanks RemedyTomm
2009-08-17 19:48:32 +01:00
30c4aa55e6
Added additional configuration options for MRM Security. See OpenSim.ini.example under the [MRM] section.
2009-08-18 00:58:42 +10:00
58d9d6026e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:23:27 +10:00
8c101d24df
* Implementing a bunch of Unimplemented MRM stubs.
2009-08-18 00:23:02 +10:00
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
3d7bb7567c
Add the ability to use -console=rest to the region server. User
...
and pass are specified the same way as for the ROBUST server
2009-08-17 09:21:39 +01:00
50056871b8
IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld UUID.
2009-08-16 19:35:14 -07:00
550d0e434f
Removing the conditional for assetID=Zero upon rezzing attachments on login.
2009-08-16 19:21:19 -07:00
82c888fc6c
Add copyright headers. Formatting cleanup. Fix a compiler warning.
2009-08-17 10:29:06 +09:00
5d47e08dad
Removed some debug messages
2009-08-16 17:11:20 -07:00
e02062051d
Making attachments work again. Tons of debug more. This needs more testing and a lot of cleaning.
2009-08-16 16:17:19 -07:00
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00
ad02aefaee
Fix argument index in log4net call. ( fixes #4003 )
2009-08-17 01:46:00 +09:00
e5b94346b6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-17 02:25:24 +10:00
fa921ec147
* Implements AppDomain Security for MRM Scripts.
...
* Added permissionLevel attribute to [MRM] section in OpenSim.ini. Default is 'Internet', however may be any of the following (case sensitive), FullTrust, SkipVerification, Execution, Nothing, LocalIntranet, Internet, Everything. For previous functionality, set to FullTrust or Execution.
2009-08-17 02:25:00 +10:00
acc14c472d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-16 12:15:14 -04:00
5e391b9f7c
* ShortVersion, another attempt at fixing the test thread death that randomly occurs.
...
* LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.
2009-08-16 12:14:49 -04:00
4eeab4097a
* minor: comments
2009-08-16 12:10:06 -04:00
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
cbd454d692
* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment
...
* Disables 'event not used' warning for IRCClientView; cuts OpenSim total warnings back.
2009-08-16 22:01:18 +10:00
c2be3edd2d
* Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of IAvatar.cs
2009-08-16 21:49:53 +10:00
b28e826541
* Implements ISecurityCredential on all uses of SOPObject.cs except Avatar Attachments.
2009-08-16 21:41:57 +10:00
John Hurliman