Justin Clark-Casey (justincc)
8f0db68424
Fix http://opensimulator.org/mantis/view.php?id=3874 - parenthesis in for statements cause script compile failures
...
This fixes a problem in OpenSim where statements of the form
for ((i = 0); (i < 10); (++i)) { ... }
do not compile even though they are valid lsl.
2009-11-20 18:39:39 +00:00
Justin Clark-Casey (justincc)
622003ab09
minor: tweak log message to say which region is being enabled for logins
2009-11-18 20:27:37 +00:00
Justin Clark-Casey (justincc)
4baac71a5e
refactor: Eliminate redundant CreateSceneViewer call on ScenePresence constructors since this is also done on other called constructors
2009-11-17 18:44:57 +00:00
Justin Clark-Casey (justincc)
710a2afd12
Add scene animator set up to apparantly uncalled no-arg ScenePresence constructor
2009-11-17 16:40:59 +00:00
Justin Clark-Casey (justincc)
da255be05a
refactor: move AvatarAnimations, BinBVHAnimation
2009-11-17 16:25:52 +00:00
Justin Clark-Casey (justincc)
61c76d1810
refactor: move AnimationSet
2009-11-17 15:20:02 +00:00
Justin Clark-Casey (justincc)
1324082b90
refactor: move most animation methods from ScenePresence into a new ScenePresenceAnimator class
2009-11-17 15:05:40 +00:00
Justin Clark-Casey (justincc)
2606bf4a53
minor: very minor formatting change
2009-11-16 19:16:24 +00:00
Diva Canto
d5c18f6149
Make GroupRootUpdate be a terse update. This method is not used by opensim (it should), but it's used by external modules.
2009-11-14 14:14:08 -08:00
dahlia
2e24415077
undo previous changes
...
add a GetGroupByPrim() method to Scene.cs
delete a redundant method
2009-11-13 22:13:40 -08:00
dahlia
e7d0aa75ba
expose SceneGraph.GetGroupByPrim(UUID)
2009-11-13 20:52:03 -08:00
Justin Clark-Casey (justincc)
e2b1fb8ff9
refactor: extract another test asset helper method
2009-11-12 19:15:08 +00:00
Justin Clark-Casey (justincc)
2f092d271e
Rename test services to mock services, since this is a more accurate description
...
remove duplicate mock inventory service
2009-11-12 18:44:03 +00:00
Justin Clark-Casey (justincc)
bb92ba97c6
Stop iar save failing on corrupt assets
...
Not ideal since one will still have to watch out for big 'corrupt asset' messages in the log, but better than an outright fail
2009-11-12 18:26:22 +00:00
Justin Clark-Casey (justincc)
cbe1cc1bc8
minor: refactor common setup in uuid gatherer test
2009-11-12 17:50:09 +00:00
Justin Clark-Casey (justincc)
55a40694e7
minor: remove mono compiler warning
2009-11-12 17:42:26 +00:00
Justin Clark-Casey (justincc)
00102e73a6
Add basic new uuid gatherer tests to check behaviour when the gather seed is a missing asset
2009-11-11 18:46:04 +00:00
Teravus Ovares (Dan Olivares)
4a2d82e14b
* Thanks to a little help from jhurliman, jradford, diva, mono's brajkovic, miguel, and the fabulous bug reports by our community members.. The workaround fix for the "ERROR:metadata.c:3211:mono_metadata_token_from_dor: code should not be reached" bug in the RegionCombinerModule.
2009-11-11 02:47:17 -05:00
Melanie
ba99081bbe
Add IScriptModuleComms interface and region module to handle dispatch of
...
script messages to region modules and sending back replies.
Hook IScriptModuleComms.OnScriptCommand to see commands and use
DispatchReply to reply to the script. It is recommended to pass the "id"
parameter from the event as the "k" parameter of the reply.
The script will receive the reply as a link message from link -1.
2009-11-10 03:36:43 +00:00
John Hurliman
5145dfa53c
* Removing the redundant SendPrimitiveTerseData.State field, it duplicates AttachPoint
...
* LLClientView.CreateImprovedTerseBlock() now uses AttachPoint and does the proper high-low swap (this should fix disappearing attachment pieces)
2009-11-09 17:13:56 -08:00
Justin Clark-Casey (justincc)
7f5d0a6735
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-09 17:36:28 +00:00
Justin Clark-Casey (justincc)
668850b974
* for iars, allow item names/folders including "/" to be escaped using "\/"
...
* also, "\" has to be escaped as "\\"
* add item name unit test for escaped characters
2009-11-09 15:49:09 +00:00
Melanie
81c439bcaa
Patch from Snoopy2. Fixes Mantis #4342
...
fixes problems when group owned land was abandoned by the land owner or reclaimed by the estate manager or by god.
Beside that this new patch makes it possible, that users can buy land directly for a group, if the buyer has the required permissions.
2009-11-08 20:36:00 +00:00
John Hurliman
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
John Hurliman
e6d7303b29
Applying #4332 , optional packet statistics logging
2009-11-05 12:01:40 -08:00
Melanie
ec0d5b408a
Change the permissions module to use the friend list cache already in the
...
friends module instead of requesting the entire friends list over the
network each time a prim is touched.
2009-11-05 17:29:52 +00:00
John Hurliman
a13e25ebbe
Initialize SceneObjectPart.RotationOffset to Quaternion.Identity
2009-11-04 16:19:56 -08:00
John Hurliman
f57a646638
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-11-04 16:08:23 -08:00
John Hurliman
ec2ebf2598
Removing EntityBase.Rotation
2009-11-04 16:08:10 -08:00
Justin Clark-Casey (justincc)
9dd5d63495
minor: remove some mono compiler warnings
2009-11-04 19:44:28 +00:00
Melanie
c72f78215b
Backport the fixes to WebFetchInventoryDescendents to the UDP
...
InventoryDescendents packet. Testing has shown that UDP inventory now
works flawlessly and, unlike CAPS inventory, doesn't download the entire
agent inventory on start. Neither does it incessantly re-request folder
NULL_KEY. Therefore, I have disabled CAPS inventory.
2009-11-04 01:56:19 +00:00
John Hurliman
1927945053
Another race condition fix in SceneObjectGroup
2009-11-02 15:09:07 -08:00
John Hurliman
0e8b5c7ffa
Fixing race conditions in the SceneObjectPart properties
2009-11-02 11:40:57 -08:00
John Hurliman
67ac9881fa
Removing duplicate SceneObjectPart.RotationalVelocity property
2009-11-02 11:28:35 -08:00
Adam Frisby
838bc80ab9
* Implemented some tweaks to monitoring module.
...
* Output is prettier & more useful.
* Added 'Alerts' to allow rules to be constructed using Monitors to detect for events such as deadlocks. This will be translated to SNMP Traps when I get SNMP implemented.
2009-11-02 00:05:49 +11:00
Adam Frisby
711dde34e4
* Implements new 'Monitoring' system for reporting performance.
...
* Mostly the same set as the StatsMonitor used for Viewer notification, but exposes some new frametimes - including EventMS, PhysicsUpdateMS, LandUpdateMS; new memory monitoring - both GC.TotalMemory and Process.PrivateWorkingMemory64; also exposes ThreadCount (using System.Diagnostics.Process)
* Type 'monitor report' on the console to see output.
* SNMP Implementation forthcoming.
2009-11-01 19:37:40 +11:00
John Hurliman
8a73dc0f8a
* Fix for a potential race condition in ScenePresence.AbsolutePosition
...
* Unified the way region handles are stored and used in ScenePresence
* Fixed camera position for child agents
* CheckForSignificantMovement now checks avatar and camera position (both are important for scene prioritization)
* Removing debug code from the previous commit
2009-10-30 03:01:15 -07:00
John Hurliman
aecaa51063
* Fixed a NullReferenceException in GetMovementAnimation() and added more protection against NREs in AddNewMovement()
...
* Removed the three second limit on ImprovedTerseObjectUpdate. With the latest fixes I don't think this is necessary, and it generates a lot of unnecessary updates in a crowded sim
2009-10-29 16:31:48 -07:00
John Hurliman
2913c24c8a
* Commented out two noisy debug lines in the LLUDP server
...
* Misc. cleanup in ScenePresence.HandleAgentUpdate()
2009-10-29 15:24:31 -07:00
John Hurliman
5c894dac8b
* Implemented foot collision plane for avatars
...
* Fixed a NullReferenceException regression
2009-10-29 05:34:40 -07:00
John Hurliman
3f2d6fe470
Ported the Simian avatar animation system to OpenSim. Landing is currently not working
2009-10-29 04:13:51 -07:00
John Hurliman
fd2c99f184
Fixing NullReferenceException regression in the previous commit
2009-10-29 02:10:48 -07:00
John Hurliman
7132877075
* Log progress messages when loading OAR files with a lot of assets
...
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
2009-10-29 01:46:58 -07:00
John Hurliman
59eb378d16
Small performance tweaks to code called by the heartbeat loop
2009-10-28 23:10:16 -07:00
John Hurliman
1c9696a9d2
Always send a time dilation of 1.0 while we debug rubberbanding issues
2009-10-28 15:11:01 -07:00
John Hurliman
a069a1ee68
Limit physics time dilation to 1.0
2009-10-28 14:44:05 -07:00
John Hurliman
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
John Hurliman
a65c8cdc38
* Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars
...
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
2009-10-28 12:45:40 -07:00
John Hurliman
cdbeb8b83b
Track timestamps when terse updates were last sent for a prim or avatar to avoid floating away forever until a key is pressed (deviates from SL behavior in a hopefully good way)
2009-10-28 03:21:53 -07:00
John Hurliman
0c466b28bb
Move the calculation of time dilation from the scene to the physics engine. The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking
2009-10-27 16:24:43 -07:00
John Hurliman
fefe767476
Lowering the position tolerance of terse updates for ScenePresences to mitigate some of the rubberbanding issues while we are sending incorrect time dilation values
2009-10-27 13:16:58 -07:00
John Hurliman
a718d7d56a
Making the defaults for interest management variables match whether you have the [InterestManagement] section in your config or not
2009-10-27 10:17:20 -07:00
John Hurliman
bcd7593dfb
Forgot a line in the previous commit
2009-10-27 10:07:35 -07:00
John Hurliman
3a1ee79ee4
Finally hunted down the Parallel deadlock. Packets were being handled asynchronously (filling up the threadpool with handlers), which would turn around and try to do parallel operations on the starved threadpool. The solution for now is to disable Parallel.cs operations until we can gracefully handle parallel operations with a potentially starved threadpool
2009-10-27 02:36:57 -07:00
John Hurliman
c75d415648
* Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) to use a non-blocking parallel method when operating in async mode
...
* Minor code readability cleanup
2009-10-27 00:26:56 -07:00
John Hurliman
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
John Hurliman
b6651ce790
* Double the priority on avatar bake texture requests to get avatars rezzing in faster than the surrounding scene
...
* Adds duplicate tracking for SceneObjectParts and ScenePresences to avoid sending out duplicate ImprovedTerseObjectUpdate packets
2009-10-26 18:22:32 -07:00
John Hurliman
0b1726b524
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 16:48:43 -07:00
John Hurliman
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
John Hurliman
119cf80e13
Added calls to GC.AddMemoryPressure() when unmanaged memory is allocated for ODE (helps the GC make better scheduling choices), and a call to GC.Collect() right before logins are enabled for a region. Although this doesn't change actual memory usage, it improves the reported usage from OpenSim and the operating system
2009-10-26 15:52:59 -07:00
John Hurliman
ac7ccdf7d7
* Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later
...
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
2009-10-26 14:41:27 -07:00
John Hurliman
de25dcfb7b
Minor tweaks to get OpenSim compiling against both the current libomv and the upcoming 0.8.0
2009-10-25 01:10:02 -07:00
John Hurliman
730930955a
Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
...
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff
* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()
* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
John Hurliman
2c34619aea
* Changed various modules to not initialize timers unless the module is initialized. Ideally, the timers would not initialize unless the module was actually enabled, but Melanie's work on configuring module loading from a config file should make that unnecessary
...
* Wrapped the Bitmap class used to generate the world map tile in a using statement to dispose of it after the JPEG2000 data is created
2009-10-23 14:22:21 -07:00
John Hurliman
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
John Hurliman
62f1a5e36d
Implemented a "FrontBack" prioritizer, using distance plus the plane equation to give double weight to prims/avatars in front of you
2009-10-23 02:38:59 -07:00
John Hurliman
588361e2a2
Experimental change to use an immutable array for iterating ScenePresences, avoiding locking and copying the list each time it is accessed
2009-10-23 01:02:36 -07:00
John Hurliman
ba2972eaf6
* Send out m_bodyRot everywhere instead of m_rotation. Still have no clue which is right
...
* Fix WorldMapModule.process() to not trip the watchdog timer
2009-10-22 14:33:54 -07:00
John Hurliman
4ba3842d71
Forgot to hit save in the last commit
2009-10-22 13:24:24 -07:00
John Hurliman
167d8e39fa
* Sending (position - hipoffset) instead of position
...
* Sending m_rotation instead of m_bodyRot in full updates to match terse updates (no idea which one is right!)
2009-10-22 13:14:41 -07:00
John Hurliman
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
Melanie
c4969d47d9
Merge branch 'master' into vehicles
2009-10-22 07:12:10 +01:00
John Hurliman
45dc4e0a54
* Added a sanity check to GetScriptAssemblies() and GetScriptStates() for the case where no scripting engine is enabled
...
* Added TokenBucket.cs to OpenSim, with some fixes for setting a more accurate MaxBurst value and getting a more accurate Content value (by Drip()ing each get)
2009-10-20 18:19:17 -07:00
John Hurliman
1833c69568
* Removed the unused m_agentUpdates collection and some extra work that was being done for AgentUpdate packets
...
* Start LLUDPClients unpaused (this variable is not being used yet)
2009-10-20 15:19:19 -07:00
John Hurliman
edd393ff30
Reverting the deletion of files related to texture sending until we figure out exactly what is and isn't needed
2009-10-20 11:58:23 -07:00
John Hurliman
9a5e7222ce
* Removing cruft left over from the conversion to the new texture sending and UDP code
...
* Changing the cache modules to only initialize the caches if they are actually enabled. Should save a bit of resources from unused cache systems
2009-10-20 10:33:23 -07:00
John Hurliman
bd03cbd815
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:19:37 -07:00
John Hurliman
142008121e
* Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This avoids .NET remoting and a managed->unmanaged->managed jump. Overall, a night and day performance difference
...
* Initialize the LLClientView prim full update queue to the number of prims in the scene for a big performance boost
* Reordered some comparisons on hot code paths for a minor speed boost
* Removed an unnecessary call to the expensive DateTime.Now function (if you *have* to get the current time as opposed to Environment.TickCount, always use DateTime.UtcNow)
* Don't fire the queue empty callback for the Resend category
* Run the outgoing packet handler thread loop for each client synchronously. It seems like more time was being spent doing the execution asynchronously, and it made deadlocks very difficult to track down
* Rewrote some expensive math in LandObject.cs
* Optimized EntityManager to only lock on operations that need locking, and use TryGetValue() where possible
* Only update the attachment database when an object is attached or detached
* Other small misc. performance improvements
2009-10-19 15:19:09 -07:00
Melanie
ffd59868f5
Merge branch 'master' into vehicles
2009-10-19 21:58:51 +01:00
John Hurliman
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
Jeff Ames
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
John Hurliman
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
John Hurliman
9c21d672d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 18:32:12 -07:00
Teravus Ovares (Dan Olivares)
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
John Hurliman
b813058635
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 13:29:12 -07:00
Teravus Ovares (Dan Olivares)
f5964347bd
* fix previous commit
2009-10-16 16:25:48 -04:00
Teravus Ovares (Dan Olivares)
ac31cb89d5
* Ensure that at least 20 frames run before letting avatar in.
2009-10-16 16:22:10 -04:00
John Hurliman
5a4fda9dc3
Updating OpenSim.ini.example with the section required to enable a useful prioritization scheme
2009-10-16 11:09:18 -07:00
John Hurliman
06354a093d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 10:09:19 -07:00
Teravus Ovares (Dan Olivares)
67afa9e633
* Make sure to unregister the OutOfBounds Physics event in RemoveFromPhysicalScene or we'll be leaking
2009-10-16 03:52:57 -04:00
Teravus Ovares (Dan Olivares)
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
John Hurliman
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
John Hurliman
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
Melanie
642084c2a9
Merge branch 'master' into vehicles
2009-10-15 21:16:05 +01:00
Melanie
6deef7d0f3
Merge branch 'master' into vehicles
2009-10-15 21:14:13 +01:00
Teravus Ovares (Dan Olivares)
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
John Hurliman
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
Melanie
6bdd6ae0a0
Merge branch 'master' into htb-throttle
2009-10-14 23:31:38 +01:00
Diva Canto
bea13e3709
Setting changeY in border crossing.
2009-10-14 11:01:46 -07:00
Melanie
d83ace0d3b
Merge branch 'master' into htb-throttle
2009-10-14 05:10:43 +01:00
Dan Lake
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
Teravus Ovares (Dan Olivares)
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
John Hurliman
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
John Hurliman
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
John Hurliman
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
Diva Canto
0cfbdf3894
Added this one file for the previous commit to work.
2009-10-12 17:01:03 -07:00
Diva Canto
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
Melanie
170d2c4660
Merge branch 'master' into htb-throttle
2009-10-12 15:25:42 +01:00
Melanie
70553a979e
Merge branch 'master' into vehicles
2009-10-12 15:12:15 +01:00
Melanie
50f509d600
Merge branch 'master' into vehicles
2009-10-12 15:11:01 +01:00
Diva Canto
ef6aa444bf
Fixed tree crossing. This will alleviate
...
http://opensimulator.org/mantis/view.php?id=4163
2009-10-11 13:46:19 -07:00
Melanie
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
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
3f0dc88c46
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-10-10 03:54:10 -04:00
Teravus Ovares (Dan Olivares)
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
dahlia
d7654c3bda
Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for researching this.
2009-10-10 00:26:43 -07:00
Teravus Ovares (Dan Olivares)
5f94889044
* Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This may reduce avatar flailing.
2009-10-10 01:49:06 -04:00
Teravus Ovares (Dan Olivares)
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
John Hurliman
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
Melanie
f6b8bac0fa
Merge branch 'master' into vehicles
2009-10-08 10:32:15 +01:00
Melanie
a52f6c56b1
Merge branch 'master' into htb-throttle
2009-10-07 05:19:20 +01:00
Diva Canto
d344ca932d
A small change in FetchInventoryDescendantsCAPS.
2009-10-06 22:19:20 -07:00
Diva Canto
8c255b374a
Uncommented log message on CAPs FetchInventoryDescendants
2009-10-06 21:32:15 -07:00
Diva Canto
58c33fbc89
Uncommented log message on CAPs FetchInventoryDescendants
2009-10-07 04:32:35 +01:00
Diva Canto
b5b53dd3eb
* One more debug message on FetchInventoryDescendants
...
* More streams close on finally
2009-10-06 19:55:35 -07:00
Melanie
6f2d183107
Merge branch 'master' into htb-throttle
2009-10-07 03:01:11 +01:00
Melanie
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
Melanie
9618c196c2
Revert "Merging in diva's locking fixes"
...
This reverts commit 832cc68513
.
2009-10-07 01:44:36 +01:00
John Hurliman
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
Diva Canto
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
John Hurliman
eb205ef4f0
Added a debug line for nebadon
2009-10-06 14:07:04 -07:00
John Hurliman
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
Melanie
0374f1b144
Merge branch 'master' into vehicles
2009-10-06 17:44:59 +01:00
Melanie
40d0018d66
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-06 15:29:46 +01:00
Diva Canto
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
Melanie
2a060136bd
Lock the heartbeat against multiple invocations. May prevent deadlocks and/or
...
runaway thread use
2009-10-06 15:28:38 +01:00
John Hurliman
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
Diva Canto
0c46df973a
Correction on the DEBUG code.
2009-10-05 21:02:10 -07:00
Diva Canto
e36a54ee2a
#if DEBBUG code for monitoring the ThreadPool.
2009-10-05 20:39:23 -07:00
Melanie
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
dahlia
efebc809ce
disable physics actors for flexible prims
2009-10-04 02:54:36 -07:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
John Hurliman
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
Melanie
9eccea5777
Merge branch 'master' into vehicles
2009-10-02 19:53:42 +01:00
Melanie
46955f4260
Merge branch 'master' into vehicles
2009-10-02 19:04:46 +01:00
Melanie
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
dr scofield (aka dirk husemann)
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
Melanie
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
Melanie
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
Melanie
4a1076128c
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-02 00:45:43 +01:00
Diva Canto
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
Melanie
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
Melanie
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
James J Greensky
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
John Hurliman
cb26878f96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 17:51:34 -07:00
Jeff Ames
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
John Hurliman
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
John Hurliman
acfe2d9f4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 15:28:23 -07:00
Melanie
67fefdb5a0
Remove predecode-j2k and it's assoaciated logic
2009-09-30 21:33:00 +01:00
John Hurliman
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
Kitto Flora
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02:00
Kitto Flora
d43f739cef
And another merge issue
2009-09-30 19:05:39 +02:00
Kitto Flora
11750a272e
And another
2009-09-30 19:04:06 +02:00
Kitto Flora
6b65eb76d0
Another small change to avoid later merge conflict
2009-09-30 19:01:55 +02:00
Kitto Flora
53fbc970ca
Small chaneg to adapt to trunk
2009-09-30 18:58:52 +02:00
opensim
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
Jeff Ames
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
dr scofield (aka dirk husemann)
09cb8a594b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-09-29 17:00:02 +02:00
Alan M Webb
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
Diva Canto
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
Diva Canto
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
Diva Canto
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
Diva Canto
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
Jeff Ames
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
Diva Canto
2432cc607e
Neighbours cache working.
2009-09-27 13:43:57 -07:00
Diva Canto
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
Diva Canto
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
Diva Canto
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
Diva Canto
7253a9453e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-26 07:49:04 -07:00
Diva Canto
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
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
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
Justin Clark-Casey (justincc)
0bdf75637f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-25 19:19:01 +01:00
Diva Canto
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
Justin Clark-Casey (justincc)
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
Rob Smart
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
nlin
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
Alan M Webb
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
John Hurliman
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
John Hurliman
f42d085ab1
SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart
2009-09-16 15:06:08 -07:00
Justin Clark-Casey (justincc)
a4c093469a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-16 18:21:46 +01:00
Justin Clark-Casey (justincc)
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
Rob Smart
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
Melanie
7c925744f6
Some OSGrid specific changes, please use this or later for OSGrid use
2009-09-15 07:55:29 +01:00
Teravus Ovares (Dan Olivares)
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
Melanie
efc43aa0d9
Change the type value for given folders to -1. Prevents inventory blowups
2009-09-13 18:24:00 +01:00
Teravus Ovares (Dan Olivares)
fe4f312d55
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 07:28:08 -04:00
Teravus Ovares (Dan Olivares)
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
Jeff Ames
01ec93945e
Formatting cleanup.
2009-09-13 13:56:09 +09:00
Diva Canto
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
Rob Smart
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
Justin Clark-Casey (justincc)
552ba5334f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-10 18:14:34 +01:00
Justin Clark-Casey (justincc)
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
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
df9f80aabd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-09 16:20:46 -04:00
Teravus Ovares (Dan Olivares)
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
Justin Clark-Casey (justincc)
bb1f64fe51
minor: suppress mono warning 0162 generated when comparing const RegionSize against a literal number
2009-09-09 18:09:23 +01:00
Teravus Ovares (Dan Olivares)
f0e2fd426b
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-08 04:43:17 -04:00
Teravus Ovares (Dan Olivares)
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
Justin Clark-Casey (justincc)
fa1d79533e
Only allow iar load/save if user is logged in to the region simulator
2009-09-07 19:57:44 +01:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
8797a82098
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-06 16:15:20 -04:00
Teravus Ovares (Dan Olivares)
511bddc8bc
* Moves another Legacy avatar inbounds check to Border
2009-09-06 16:15:06 -04:00
Melanie
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
Melanie
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
Teravus Ovares (Dan Olivares)
8855c2e54c
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-05 03:00:50 -04:00
Teravus Ovares (Dan Olivares)
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
Diva Canto
b6744a6566
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-04 22:31:10 -07:00
Diva Canto
c48ec97817
Fixed some long-standing issues with appearance in HG1.
2009-09-04 22:30:30 -07:00
Teravus Ovares (Dan Olivares)
2c09634aed
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-04 20:19:50 -04:00
Teravus Ovares (Dan Olivares)
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
Justin Clark-Casey (justincc)
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
John Hurliman
33133e23b1
Fixes seven leaky .BeginInvoke() calls
2009-09-03 12:36:51 -07:00
Jeff Ames
56ddd6828c
Add copyright headers. Formatting cleanup.
2009-09-03 02:04:17 +09:00
Teravus Ovares (Dan Olivares)
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
Melanie
f32de6fe88
Thank you, dslake, for a set of patches to improve OpenSim startup
...
and idle performance.
2009-09-02 03:33:31 +01:00
dr scofield (aka dirk husemann)
39726f0fda
switching SerialiserModule to "new" region module scheme
2009-09-01 10:28:29 +02:00
Teravus Ovares (Dan Olivares)
2245e2977e
* The return of fuzzy borders!
2009-08-31 23:16:24 -04:00
Teravus Ovares (Dan Olivares)
3718bbc6a5
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-31 22:51:03 -04:00
Teravus Ovares (Dan Olivares)
c09884a467
No more fuzzy borders
2009-08-31 22:50:27 -04:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
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
Melanie
29df190a3f
Baad git, baad baad git.
2009-09-01 02:02:52 +01:00
Melanie
22457c9843
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-01 01:56:59 +01:00
Melanie
e458a87e91
Experimental. Set attachment flag early on rezzing from inventory.
2009-09-01 01:53:54 +01:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
b997174d08
* Fix attachment cross issues with new borders.
2009-08-31 20:07:33 -04:00
Jeff Ames
bbef5c344e
Remove typo version of ReplaceableInterface property from RegionCombinerModule.
2009-08-31 14:16:16 +09:00
Teravus Ovares (Dan Olivares)
9f2f3afe22
* Fixes a teleport issue when teleporting out of a region to a different one.
2009-08-30 02:49:50 -04:00
Teravus Ovares (Dan Olivares)
d4dd179547
* whoops, forgot the other class initializer.
2009-08-30 00:29:43 -04:00
Teravus Ovares (Dan Olivares)
59c8a02a24
* When the RegionCombinerModule is off, make borders have an infinite aabb perpendicular to the cardinal
2009-08-30 00:22:38 -04:00
Teravus Ovares (Dan Olivares)
2f40161f38
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-29 23:50:24 -04:00
Teravus Ovares (Dan Olivares)
33f36c9010
* Rename the RegionCombiner Module from PhysicsCombiner
2009-08-29 23:39:27 -04:00
Teravus Ovares (Dan Olivares)
44b7c39c93
* Fix the reason why physical vehicles have a problem in virtual regions.
2009-08-29 21:47:28 -04:00
Teravus Ovares (Dan Olivares)
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
Melanie
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
Teravus Ovares (Dan Olivares)
9eb8c14e87
* Deal with teleports to other virtual regions in the same scene.
2009-08-28 19:42:28 -04:00
Melanie
22a0dff226
Modify CAPS inventory code. Currently this is not executed
2009-08-28 23:28:32 +01:00
Teravus Ovares (Dan Olivares)
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
Justin Clark-Casey (justincc)
d649194be3
minor: formatting and comments
2009-08-28 12:52:40 +01:00
Teravus Ovares (Dan Olivares)
65dda8a795
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-27 19:36:52 -04:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
54e05a083d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-26 11:48:05 -04:00
Diva Canto
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
Diva Canto
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
Adam Frisby
25dbf16cfb
* Once more into the breach!
2009-08-21 13:44:20 +10:00
Adam Frisby
d4600eec4d
* Attempting to diagnose a connection bug.
2009-08-21 13:35:13 +10:00
Teravus Ovares (Dan Olivares)
181b992b4a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-20 19:25:52 -04:00
Teravus Ovares (Dan Olivares)
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
Diva Canto
1604c9d19e
One more place fixed for setting the inventory folder owner. Thanks jhurliman.
2009-08-20 10:14:53 -07:00
Diva Canto
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
Diva Canto
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
Teravus Ovares (Dan Olivares)
289439c832
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-19 14:43:18 -04:00
Teravus Ovares (Dan Olivares)
de543002aa
Add Border (a virtual border management class)
...
Move Cardinals to it's own file.
2009-08-19 14:43:03 -04:00
Diva Canto
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
Diva Canto
4382f28efc
Async purge so that the client thread doesn't wait.
2009-08-19 00:33:02 -07:00
Diva Canto
c5af39239f
A better purge of trash folder.
2009-08-19 00:13:51 -07:00
Diva Canto
124f66bfc2
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
2009-08-18 22:17:47 -07:00
Diva Canto
d95d3b949b
Fixes mantis #4020 ( http://opensimulator.org/mantis/view.php?id=4020 )
2009-08-18 07:05:22 -07:00
Diva Canto
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
Diva Canto
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
Diva Canto
50056871b8
IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld UUID.
2009-08-16 19:35:14 -07:00
Diva Canto
550d0e434f
Removing the conditional for assetID=Zero upon rezzing attachments on login.
2009-08-16 19:21:19 -07:00
Jeff Ames
82c888fc6c
Add copyright headers. Formatting cleanup. Fix a compiler warning.
2009-08-17 10:29:06 +09:00
Diva Canto
5d47e08dad
Removed some debug messages
2009-08-16 17:11:20 -07:00
Diva Canto
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
Jeff Ames
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00
Teravus Ovares (Dan Olivares)
acc14c472d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-16 12:15:14 -04:00
Teravus Ovares (Dan Olivares)
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
Diva Canto
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
Jeff Ames
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
Adam Johnson
a42569d896
Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet Handler - ref mantis #4010
2009-08-16 15:06:06 +09:00
Diva Canto
19e45466f2
Changed one word in a comment
2009-08-15 14:57:24 -07:00
Diva Canto
1bbf06405c
Changed FromAssetID to FromItemID
2009-08-15 09:36:45 -07:00
Diva Canto
dd8b9d5810
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-15 08:21:15 -07:00
Teravus Ovares (Dan Olivares)
95be3eccd2
* minor: comments
...
* also re-trigger panda
2009-08-15 00:01:58 -04:00
Teravus Ovares (Dan Olivares)
f208628667
* minor : Comments
...
* Also re-trigger Panda.
2009-08-14 21:37:25 -04:00
Teravus Ovares (Dan Olivares)
2f61fb0243
* minor : comments
...
* also re-trigger panda
2009-08-14 21:19:04 -04:00
Teravus Ovares (Dan Olivares)
1b933c9116
* Put the StandaloneTeleportTest in a new thread and call Thread.Join() inside a try/Catch (ThreadAbortException) to try and get around scene code aborting the testing thread. Use a Messenger class to report the results back to the test thread.
2009-08-14 19:12:42 -04:00
Diva Canto
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
Teravus Ovares (Dan Olivares)
dce81225c5
* allocate the dictionary for AgentCircuitData.ChildrenCapSeeds when creating the circuitdata object to see if it's the cause of a null reference exception in the TestAddNeighbourRegio test
2009-08-14 14:15:49 -04:00
Teravus Ovares (Dan Olivares)
6ece8d86e0
Deal with possible race in TestAddNeighborRegion in ScenePresenceTests
2009-08-13 23:06:29 -04:00
Diva Canto
5246dc33dc
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
2009-08-13 14:10:12 -07:00
Diva Canto
6b9cc6c48d
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
2009-08-13 11:30:29 -07:00
Diva Canto
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
Jeff Ames
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
Diva Canto
7aa54593e0
Redirected all calls to CachedUserProfile methods to the inventory service. Redirection of the RootFolder property is still todo. This compiles but probably inventory will be inconsistent.
2009-08-12 20:39:48 -07:00
Diva Canto
41ad610f3e
* Added two new packet handler implementations for inventory ops. This is starting to work! - but can't be activated incrementally, the flip needs to be global for all inventory ops.
...
* Added a base inventory connector that does common processing of inventory among all reference connector implementations. E.g. AddItem requires additional processing before being forwarded to service.
* Added if (m_Enabled) upon RemoveRegion
2009-08-12 13:11:15 -07:00
Diva Canto
10d923dbea
Fixes a race condition in EQ processing that was making EQs pop up again upon client close.
...
Commented remote call on GetSystemFolders again, so that it's not live yet.
2009-08-11 16:47:36 -07:00