John Hurliman
6d04a213d6
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-18 20:25:16 -07: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
Diva Canto
baed19d068
A bit of instrumentation to figure out what's going on with physics actors.
2009-10-18 16:48:44 -07:00
John Hurliman
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
John Hurliman
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
John Hurliman
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
John Hurliman
a3f93cffb4
* Committing Nini.dll with the patch from #3773 applied
...
* Fixing a log message typo
2009-10-17 22:06:36 -07: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
e28ac42486
Wrapped the contents of the IncomingPacketHandler loop in a try/catch statement
2009-10-17 17:19:18 -07:00
John Hurliman
3a63de8d02
Added a description for RegionType
2009-10-17 15:55:30 -07:00
Melanie
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
Melanie
cdcbd22ba8
Merge branch 'master' into prioritization
2009-10-17 14:51:17 +01:00
Melanie
c7da13eb23
Adds SendAvatarInterestsUpdate to IClientAPI
...
Thank you, Fly-Man
2009-10-17 14:50:21 +01:00
Melanie
e5ccd3f793
Merge branch 'master' into prioritization
2009-10-17 14:34:48 +01:00
Melanie
a95741cdd6
Re-rename ProductName back to it's original RegionType
2009-10-17 14:33:46 +01:00
Melanie
077f473167
Merge branch 'master' into prioritization
2009-10-17 13:41:32 +01:00
Melanie
72b96bcd84
Add ProductName to RegionInfo (for search)
2009-10-17 13:36:45 +01: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
Teravus Ovares (Dan Olivares)
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
John Hurliman
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
John Hurliman
7d6d94a7b5
More debugging of RegionCombinerModule.RegionLoaded() by making RegionLoaded() a two line function
2009-10-16 16:49:13 -07:00
John Hurliman
f3f93228e0
Changing the region module loading foreach loops to typecast things to the IRegionModuleBase interface where AddRegion(), RegionLoaded(), etc. actually exist. Shot in the dark at fixing the Mono issue
2009-10-16 15:50:22 -07:00
John Hurliman
c04ffe5c94
Reverting the previous ugly hack and replacing it with try/catch statements for each RegionLoaded() call. This probably won't fix nebadon's crash, but it seems like a good idea
2009-10-16 15:44:20 -07:00
John Hurliman
c3712a56f5
A very ugly and temporary hack to disable the RegionCombinerModule RegionLoaded from firing for testing
2009-10-16 15:34:27 -07:00
John Hurliman
c21f19741d
Adding noisy debug for nebadon
2009-10-16 15:17:37 -07:00
John Hurliman
80a8a9c4a7
Converted FireAndForget methods to use a singleton pattern to attempt to work around a Mono bug with nested delegates
2009-10-16 14:34:42 -07:00
John Hurliman
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
John Hurliman
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
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
John Hurliman
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
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
eee1318597
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 12:42:53 -07:00
John Hurliman
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
Teravus Ovares (Dan Olivares)
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
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
Melanie
5de657cf5d
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-16 13:29:07 +01:00
Melanie
0487092d15
Thank you, Fly man, for plumbing the AvatarInterestsUpdate packet
2009-10-16 13:28:40 +01: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)
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
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
jjgreens
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
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
b1c93cd3b1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-14 19:24:09 -07: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
Diva Canto
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
John Hurliman
fe4109a5b0
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 16:48:42 -07:00
John Hurliman
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
John Hurliman
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
Melanie
6bdd6ae0a0
Merge branch 'master' into htb-throttle
2009-10-14 23:31:38 +01:00
John Hurliman
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
John Hurliman
25878d6828
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 13:00:42 -07:00
John Hurliman
c033477d2f
* Read scene_throttle_bps from the config file and use it
...
* Minor formatting cleanup
2009-10-14 11:52:48 -07:00
Justin Clark-Casey (justincc)
c58713a3a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-10-14 19:44:19 +01:00
John Hurliman
4b5a2f8c02
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 11:44:17 -07:00
Justin Clark-Casey (justincc)
0cb0a28fde
* minor: remove some mono compiler warnings
2009-10-14 19:43:56 +01:00
John Hurliman
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
Diva Canto
bea13e3709
Setting changeY in border crossing.
2009-10-14 11:01:46 -07:00
Melanie
3795cface2
Enable LSL dialogs to display group names properly
2009-10-14 17:39:38 +01:00
Melanie
d83ace0d3b
Merge branch 'master' into htb-throttle
2009-10-14 05:10:43 +01:00
Melanie
db4cdc0961
Set the estate owner to be the master avatar if it's not set.
2009-10-14 04:18:59 +01:00
John Hurliman
4135b0c4dc
* Split Task category into Task and State
...
* Crude prioritization hack
2009-10-13 19:45:38 -07: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
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
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
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
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
John Hurliman
f55b282078
Avoid checking m_clients collection twice when a UseCircuitCode packet is received
2009-10-13 11:28:08 -07:00
John Hurliman
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
John Hurliman
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
Diva Canto
e3d5beebfb
Better handling of missing assets.
2009-10-13 06:39:11 -07:00
Diva Canto
f3d2192cd4
Better handling of missing assets.
2009-10-12 18:30:06 -07:00
Diva Canto
63ed605eba
Stop the recurring texture requests for textures that truly don't exist.
2009-10-12 17:36:13 -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
bf68dad643
0004246: [Patch] FlotsamAssetCache deep scan & cache
...
Thank you, mcortez.
2009-10-12 23:21:32 +01:00
Melanie
09cd2ac443
Stop null values from being returned on database queries
2009-10-12 20:46:19 +01: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
unknown
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
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
Diva Canto
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
dahlia
7b4183d7a0
sync PrimMesher with r46
2009-10-11 02:12:17 -07:00
dahlia
41b27ef064
disambiguate System.Path (preparation for new PrimMesher)
2009-10-11 01:30:24 -07:00
Diva Canto
01783877ec
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-10 06:36:10 -07:00
Diva Canto
8030ed89b0
Use Util.UTF8 instead of creating a new heap object every time.
2009-10-10 06:35:31 -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
Melanie
ef03b2d936
Fix selling objects
2009-10-10 10:18:16 +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
Diva Canto
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
John Hurliman
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
Diva Canto
f29bd8036d
A slight improvement on name fetching -- using the local name cache, since it exists.
2009-10-09 14:36:08 -07:00
Diva Canto
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
Diva Canto
c146f2c8c4
Use the cache, Luke!
2009-10-09 13:49:55 -07:00
Diva Canto
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
Melanie
527c94825b
Merge branch 'master' into htb-throttle
2009-10-09 17:23:18 +01:00
Melanie
78f57283f4
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-09 17:22:39 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Rob Smart
1c220e173c
Adding a hair item to the default wearables, fixes newly created avatars appearing as a cloud
2009-10-09 17:22:02 +01:00
Melanie
23586b69a1
Slow down the packet receiving code again after new reports of thread storms.
2009-10-09 12:17:55 +01: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
John Hurliman
76a5cae0b4
Forgot to initialize m_writeLock
2009-10-09 02:18:25 -07:00
John Hurliman
a3e31cdeaf
Added more debugging output to the "unrecognized source" warning
2009-10-09 02:13:21 -07:00
John Hurliman
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
John Hurliman
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
John Hurliman
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
John Hurliman
3a04d706c9
Fear the lockless LLUDP implementation!
2009-10-08 17:34:51 -07:00
Diva Canto
51ea39199b
Putting the lock back in TryGetValue.
2009-10-08 15:42:08 -07:00
Melanie
a0dd9f4bb4
Fork UDPBase from libOMV into opensim
2009-10-08 22:25:14 +01:00
Diva Canto
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
Melanie
f6b8bac0fa
Merge branch 'master' into vehicles
2009-10-08 10:32:15 +01:00
Melanie
1eb390beda
Remove ThreadTrackerTest. It's no longer relevant because the thread
...
tracker now uses the system thread list
2009-10-08 08:32:34 +01:00
Melanie
fe679be9e7
Merge branch 'htb-throttle'
2009-10-08 08:07:38 +01:00
Diva Canto
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
Diva Canto
dd80380df5
Another go at the deadlock: not locking TryGetValue, and just catch/ignore exceptions.
2009-10-07 19:45:57 -07:00
Diva Canto
29f03d95f3
Bug fix.
2009-10-07 19:20:34 -07:00
Diva Canto
c71b3e730d
Changed the locking mechanism, because the existing one is causing deadlocks to occur.
2009-10-07 18:54:08 -07:00
Diva Canto
ab3bfca546
Printout one more field in show threads, but this won't buy us much.
2009-10-07 17:29:21 -07:00
Melanie
d9f15fbf40
store owner_uuid in the region table
2009-10-07 19:37:18 +01:00
Melanie
48826fcdf7
Remove debug again
2009-10-07 19:22:27 +01:00
Melanie
a0b6cc3861
Enable debugging of the region connector's query string
2009-10-07 19:10:18 +01:00
Melanie
6fdec1f7c9
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-07 18:35:33 +01:00
Melanie
596f2307bf
Add owner_uuid. Not sure this works. Worth a test
2009-10-07 18:34:59 +01:00
Diva Canto
78e4501bef
Improved fault handling in HelloNeighbour.
2009-10-07 08:42:33 -07:00
Melanie
d06c7d90a1
Correct a build break caused by an optimization in trunk
2009-10-07 06:56:00 +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
Melanie
a52f6c56b1
Merge branch 'master' into htb-throttle
2009-10-07 05:19:20 +01:00
Melanie
d33b6fef2b
replace LLClientView with proper version
2009-10-07 04:37:12 +01:00
Melanie
adc208e568
Replace LLClientView on the branch with master. UNCOMPILABLE!
2009-10-07 04:36:36 +01: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
312438f145
Commented noisy debugging about packet splitting
2009-10-06 15:55:39 -07:00
John Hurliman
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
John Hurliman
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
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
9cb5db3621
Applying the real fix (thank you for tracking that MSDN doc down Melanie)
2009-10-06 15:08:09 -07:00
John Hurliman
74fe284a20
Trying Melanie's fix
2009-10-06 14:50:46 -07:00
John Hurliman
c855806548
Reverting MySQLLegacyRegionData spam
2009-10-06 14:26:00 -07:00
John Hurliman
a3a8691ebe
MySQLLegacyRegionData: Extreme Spam Edition(tm)
2009-10-06 14:18:37 -07:00
John Hurliman
eb205ef4f0
Added a debug line for nebadon
2009-10-06 14:07:04 -07:00
John Hurliman
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
Justin Clark-Casey (justincc)
99c85b5ef5
* Change some more default ports to the robust default of 8003
...
* Make these use existing constants rather than hardcoding
* These will probably go away soon anyway once all services are under ROBUST
2009-10-06 20:32:33 +01: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
John Hurliman
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
Diva Canto
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
John Hurliman
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
Diva Canto
3db4d38645
Removing dependencies on System.Runtime.Remoting.
2009-10-06 09:54:15 -07:00
Melanie
0374f1b144
Merge branch 'master' into vehicles
2009-10-06 17:44:59 +01:00
Diva Canto
e474fc2fdb
Corrected words in error message.
2009-10-06 08:50:25 -07: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
Melanie
8a7a947faa
Remove the using() constructs from the new style database modules; they caused
...
the underlying connection of a reader or command to be closed before the
reader or command itself. Added the proper logic to Close and dispose items
in CloseDBConnection. Readers and Connections need Close(), Commands need
Dispose(), in the order Reader, Command, Connection.
Also reinstated 80-column-friendly formatting
2009-10-06 14:30:25 +01:00
John Hurliman
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
John Hurliman
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
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
John Hurliman
7ddb6fbced
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-05 17:38:27 -07:00
John Hurliman
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
John Hurliman
a76a1afda8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-05 16:41:19 -07:00
John Hurliman
6720369376
Added CloseDBConnection() to replace the old CloseReaderCommand(). This will close the MySQLConnection attached to a MySQLCommand. I'm not sure if this accounts for every time a database connection needs to be closed, but it matches up 1:1 with the places where the database connection was previously being closed
2009-10-05 16:39:40 -07:00
Diva Canto
2753f4d62c
* GridServerPostHandler.cs: Try/catch in Handle
...
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
Michael Cortez
f4726f4bcc
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:52:07 +01:00
Michael Cortez
90d1ef9e4a
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:52:01 +01:00
Michael Cortez
d4a6d9191a
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:47:00 +01:00
Michael Cortez
544675d0f0
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:47:00 +01:00
Diva Canto
282b752035
Minor change.
2009-10-05 13:14:14 -07:00
Diva Canto
9bd1353875
Fixed bug introduced in one of the last commits.
2009-10-05 12:13:38 -07:00
Diva Canto
05b80185b9
More debug to try to diagnose a problem with region registration.
2009-10-05 11:49:21 -07:00
Diva Canto
5f18a088a8
More error catching/outputting.
2009-10-05 11:14:46 -07:00
Diva Canto
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
Justin Clark-Casey (justincc)
2a19187e01
* minor: tweak asset cache logging levels downwards
2009-10-05 18:32:19 +01:00
Diva Canto
62ea6b6383
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-05 10:31:41 -07:00
Diva Canto
a2d5da7129
More debug messages if things go wrong.
2009-10-05 10:31:09 -07:00
Justin Clark-Casey (justincc)
10c4b88ccf
minor: remove mono compile warning
2009-10-05 18:20:37 +01:00
Diva Canto
81c08ec74a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-05 09:19:16 -07:00
Diva Canto
75b35ddf4a
More error messages to warn when/if things go wrong.
2009-10-05 09:18:51 -07:00
Diva Canto
ad81b453b3
GetRegionByPosition: use the cache, Luke.
2009-10-05 09:02:52 -07:00
Melanie
8d7075c5c6
Adapt to renamed members in landObject
2009-10-05 16:33:25 +01:00
Melanie
0cb974bc76
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-05 16:32:31 +01:00
Melanie
5702c8f910
Adapt to renamed members in landObject
2009-10-05 16:31:54 +01:00
Melanie
a7023ed81c
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-05 16:08:57 +01:00
unknown
7c3e5afc0c
MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up
2009-10-05 16:08:35 +01:00
unknown
82df3d8fd6
MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up
2009-10-05 16:07:33 +01:00
Melanie
8d5a40aad0
Merge branch 'master' into vehicles
2009-10-05 12:58:52 +01:00
Dan Lake
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
Melanie
dcdcbb314e
Fix build break
2009-10-05 11:08:02 +01:00
Melanie
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
dahlia
5c593f3892
only cache mesh if meshing was successful
...
re-enable sculpt mesh caching
2009-10-04 20:01:44 -07:00
Melanie
a208f33c5d
Make the asset connector async Get overload return false if the asset
...
retrieval was not synchronous.
2009-10-05 00:23:47 +01:00
Diva Canto
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
Diva Canto
08d3650138
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-04 14:06:28 -07:00
Diva Canto
5b19d5a7b7
Reduced locking.
2009-10-04 14:05:58 -07:00
John Hurliman
a528e7704c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-04 13:58:22 -07:00
John Hurliman
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
Diva Canto
022526661b
Just trying a few things. This one will reduce the number of async calls.
2009-10-04 13:38:12 -07:00
Diva Canto
d93e0a0503
Guarding a line that is sometimes throwing a null pointer exception.
2009-10-04 10:30:21 -07:00
Diva Canto
30aac00f6b
Closing more streams even if things fail.
2009-10-04 10:12:19 -07:00
Diva Canto
fe9cca64de
Stream needs to be closed before the file can be moved...
2009-10-04 09:56:54 -07:00
Diva Canto
b803d5ab9b
Make sure to close the file streams on the FlotsamCache, even if something fails.
2009-10-04 09:44:04 -07:00
Diva Canto
f21f3727df
Leaving the MemoryStreams unclosed.
2009-10-04 09:20:01 -07:00
Diva Canto
366bfe17ae
Trying to avoid the null pointer exception in J2KImage, RunUpdate.
2009-10-04 07:41:10 -07:00
dahlia
95ebb7794c
flexible extrusion shape defaults to linear
2009-10-04 02:59:12 -07:00
dahlia
efebc809ce
disable physics actors for flexible prims
2009-10-04 02:54:36 -07:00
dahlia
0cbd9eee2f
Exclude sculpt proxies from mesh caching
2009-10-04 02:14:13 -07:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
Diva Canto
2d9c27a28f
Slightly better message with status code for WebException.
2009-10-03 20:18:21 -07:00
Diva Canto
b2cdee5a14
Better error handling to diagnose login problems.
2009-10-03 19:08:56 -07:00
Diva Canto
b6920267f0
Close was being called to early on the Memory stream.
2009-10-03 16:27:55 -07:00
Diva Canto
b75b887798
Fixed interface between the Messaging server and the grid server.
2009-10-03 11:55:52 -07:00
Diva Canto
df7049008a
More streams closed.
2009-10-03 08:57:30 -07:00
Diva Canto
de94aa9bb5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-03 08:46:25 -07:00
Diva Canto
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
Diva Canto
4843edfeb7
Closing more streams.
2009-10-03 08:33:19 -07:00
Melanie
874e423141
Fix my build break
2009-10-03 15:37:31 +01:00
Melanie
b4d1cf0009
Small permissions tweak
2009-10-03 14:22:29 +01:00
Diva Canto
006dfd6d9a
Closing another stream.
2009-10-02 20:35:15 -07: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
John Hurliman
3ab6c89652
Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
2009-10-02 16:54:03 -07:00
John Hurliman
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
Diva Canto
7a2ac292d6
Merge branch 'diva-textures-osgrid' of ssh://diva@opensimulator.org/var/git/opensim into diva-textures-osgrid
2009-10-02 16:24:13 -07:00
Diva Canto
e66321227e
Close streams in MakeRequest.
2009-10-02 16:23:46 -07:00
Melanie
36c8d55827
Merge branch 'diva-textures-osgrid'
2009-10-03 00:03:09 +01:00
Melanie
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
John Hurliman
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
John Hurliman
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
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
Melanie
6def897556
Merge branch 'diva-textures-osgrid' into diva-textures
2009-10-02 19:02:38 +01:00
dr scofield (aka dirk husemann)
6c068eaf12
reducing script engine log spam
2009-10-02 12:38:13 +02:00
dr scofield (aka dirk husemann)
75a42e0459
reducing region DB log spam
2009-10-02 12:05:59 +02:00
dr scofield (aka dirk husemann)
3c271bf222
fixing TestLandChannel to let it return empty List<ILandObject>() (as
...
does the real LandChannel), percolating to SceneSetupHelpers.
2009-10-02 11:31:30 +02: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
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
Melanie
9a429610e2
Merge branch 'diva-textures-osgrid' into texturetest
2009-10-02 04:19:22 +01:00
Diva Canto
746dad7b74
Locking the priority queue to see if it gets pass that exception.
2009-10-01 20:32:22 -07:00
Melanie
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
John Hurliman
54ff84050f
Removing console debug spew
2009-10-01 18:12:13 -07:00
Adam Frisby
a2cdbd784d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-02 10:54:01 +10:00
John Hurliman
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
Adam Frisby
a030e3d61b
* Attempting to fix a issue with console commands & the estate module. Again.
2009-10-02 10:53:21 +10:00
John Hurliman
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
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
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
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
Diva Canto
ac0927c922
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-01 16:40:04 -07:00
Diva Canto
c8c4b4c505
Switched log level of an annoying message in SQLite to Debug, and commented it too.
2009-10-01 16:39:41 -07:00
Melanie
54a912bb9c
Add a method to determine the count of packets in a throttle
2009-10-01 22:35:57 +01:00
Melanie
7c1fdb2540
Add "dump asset" command to remote asset connector (the only one that uses a
...
cache at all)
2009-10-01 21:29:57 +01:00
Melanie
26478ff689
Add "dump asset" command to remote asset connector (the only one that uses a
...
cache at all)
2009-10-01 21:26:53 +01:00
Melanie
5e9da4daab
Add OnQueueEmpty event to the packet layers. No user functinality yet
2009-10-01 21:08:17 +01:00
Diva Canto
94783e9377
Catch and print exceptions in MessagingService, to diagnose mysterious disappearances of the Messaging server.
2009-10-01 09:17:22 -07:00
Melanie
d0cc0985fa
Fix a merge conflict
2009-10-01 14:45:06 +01:00
Melanie
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
dr scofield (aka dirk husemann)
133a4a9906
- adding new LandDataSerializer testcase to "test-xml" target as well
...
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
dr scofield (aka dirk husemann)
05da73c300
fixing LandDataSerializer (yeah! for testcases)
2009-10-01 12:01:41 +02:00
dr scofield (aka dirk husemann)
18416ec518
Merge branch 'oar-parcel' into x-opensim
2009-10-01 10:30:43 +02:00
dr scofield (aka dirk husemann)
77ed8e977a
adding meat to the LandDataSerializerTest cases.
2009-10-01 10:30:26 +02:00
dr scofield (aka dirk husemann)
5b378a793b
Merge branch 'oar-parcel' into x-opensim
2009-10-01 09:48:30 +02:00
dr scofield (aka dirk husemann)
40cf840df2
adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)
2009-10-01 09:47:45 +02:00
James J Greensky
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
Diva Canto
1eb6f99d19
Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.
2009-09-30 20:27:40 -07: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
041aaaa62c
Prevent null data being sent to the decoder
2009-09-30 22:21:22 +01:00
Melanie
79ba96ad6f
Limit the number of packet data blocks to 50, as packets are already limited
...
This is enough to prevent the fast back and forth of allocation and release
the pool is meant to prevent, but not too much so we don't hog memory
2009-09-30 21:33:29 +01:00
Melanie
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
Melanie
67fefdb5a0
Remove predecode-j2k and it's assoaciated logic
2009-09-30 21:33:00 +01:00
Melanie
b0c0d6f9d1
Squelch the debug noise from diva's patch
2009-09-30 20:36:20 +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
Melanie
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
Melanie
8d35cd9061
Remove more tests that don't apply to this build
2009-09-30 19:25:48 +01:00
Melanie
41e4f3afdb
Remove some tests that no longer apply
2009-09-30 19:14:58 +01:00
John Hurliman
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
Diva Canto
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
Melanie
61d6e42af2
Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles
2009-09-30 17:46:04 +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)
33515c75e4
adding LandDataSerializer (not connected anywhere, work-in-progress)
...
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
Melanie
1006a2254c
Make create user to the Right Thing with regard to salting user passwords
2009-09-30 13:36:03 +01:00
Melanie
377a8b5229
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-30 11:17:27 +01:00
Melanie
94aa7e677c
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 09:12:43 +01:00
Diva Canto
89016203de
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 16:13:31 -07:00
Diva Canto
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
Justin Clark-Casey (justincc)
e9c05cf385
change 0.6.7 candidate branch down to RC1
2009-09-29 21:47:11 +01: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
Diva Canto
37a8b2b8b7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 07:56:29 -07: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
Alan M Webb
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
Jeff Ames
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
Melanie
691f1e8aa0
Fix loading modules with alternate configurations and ports into ROBUST.
...
Make all current modules support the configuration name option
2009-09-29 09:56:17 +01:00
Diva Canto
13c6202da9
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-29 09:50:18 +01:00
Melanie
1096103d66
Fix loading modules with alternate configurations and ports into ROBUST.
...
Make all current modules support the configuration name option
2009-09-29 09:44:12 +01:00
Diva Canto
6653a30487
Fixed bug in HG that was causing secondlife:// refs to bomb the client.
...
Also fiddled a bit more with the initial CAP in the user server.
2009-09-28 20:58:21 -07:00
Diva Canto
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
Diva Canto
f4e8ac3556
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-28 18:53:07 -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
Melanie
0709149313
Merge branch 'grid-service-redux'
2009-09-28 23:03:47 +01:00
Melanie
fe3760e4a2
Merge branch 'master' into 0.6.7-post-fixes
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
2009-09-28 22:57:38 +01:00
Melanie
a1aa362866
Allow the notation config_name@port/dll_name:class_name as a handler spec
...
in OpenSim.Server.ini
This allows things like "8003/AssetServirce.dll local@8004/InventoryService.dll"
The config name is not yet supported by any modules
2009-09-28 22:48:57 +01:00
Diva Canto
276b0a0cbe
Forgot a return statement.
2009-09-28 11:17:34 -07:00
Diva Canto
9bdb585a93
Added Protocol versions back, this time in a range model.
2009-09-28 10:56:05 -07:00
Melanie
7cd03abab5
Bump main version to 0.6.8-Dev
2009-09-28 18:41:21 +01:00
Melanie
63c3c7483f
Bump version number in post-fixes
2009-09-28 18:38:48 +01:00
Diva Canto
3091e5db9d
Fixed bug in user server related to region's serverURI.
2009-09-28 07:53:52 -07:00
Diva Canto
500cd3505a
Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now.
2009-09-28 07:20:38 -07:00
Diva Canto
69da82b39f
Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer.
2009-09-28 06:44:57 -07:00
Diva Canto
0f05bbb4a2
Deleted some files that aren't being used anymore.
2009-09-28 05:54:37 -07:00
Melanie
0ed7371f3e
Change DocToBytes to return no trailing whitespace.
2009-09-28 13:27:33 +01:00
Diva Canto
73a61a8a32
Fixed small bug in having to deal with RegionInfo's ServerURI, which wasn't being set.
2009-09-27 21:14:31 -07:00
Diva Canto
0766b6dc34
Fixed the connection from User server to GridServer.
2009-09-27 20:44:43 -07:00
Diva Canto
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
Diva Canto
b17be045e4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-27 16:02:19 -07:00
Diva Canto
689eea3bad
Guarding the methods under if (m_Enabled)
2009-09-27 15:06:44 -07:00
Melanie
42746e99bd
Make the RegionData plugin store the RegionName
2009-09-27 23:02:40 +01:00
Diva Canto
cde6b0d5ab
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-27 14:59:43 -07:00
Diva Canto
1980ab3152
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-27 14:39:41 -07:00
Diva Canto
c99b363f81
Added missing IHyperlinkService.
2009-09-27 13:59:00 -07:00
Melanie
12640d0824
Prevent manually setting Data["locX"] and Data["locY"], since that would
...
overwrite the posX and posY members of the structure
2009-09-27 21:58:34 +01:00
Diva Canto
2432cc607e
Neighbours cache working.
2009-09-27 13:43:57 -07:00
Melanie
b5bf3f87d5
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
2009-09-27 21:25:10 +01:00
Melanie
8e091f5903
Add the Migration for the regions table
2009-09-27 21:17:23 +01: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
68e40a87ca
Poof! on LocalBackend. CommsManager.GridServices deleted.
2009-09-26 21:29:54 -07:00
Diva Canto
620fa2b772
Poof! on OGS1 GridServices.
2009-09-26 21:21:06 -07:00
Diva Canto
989382352d
Poof! on Region.Communications.Hypergrid. Grid code deleted.
2009-09-26 21:14:41 -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
dcfd08b8dd
Fixed a bug with link-region.
2009-09-26 11:01:18 -07:00
Diva Canto
b5163889b9
Fixed the order of params to GetRegionRange.
2009-09-26 10:30:45 -07:00
Diva Canto
368ae02dc9
Corrected the port number to 8001 in the test client and grid ini.
2009-09-26 10:18:22 -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
d39e67d5b2
More redirects to HGGridConnector-as-HyperlinkService.
2009-09-26 08:06:14 -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)
a7f3d01f8a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-25 16:06:40 -04: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
dahlia
fb2cabd6b3
corrections to viewerMode AddPos()
2009-09-25 13:01:48 -07: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)
2995d87d75
minor: remove some mono compiler warnings
2009-09-25 19:29:40 +01: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
eed8a61559
More small changes to FlotsamAssetCache as per mcortez' request.
2009-09-25 08:47:45 -07: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)
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
Diva Canto
295868033f
Better error handling on the client-side grid connector.
2009-09-25 07:47:58 -07:00
Diva Canto
b2772b3a2d
Added GridForm.html in Tests/Clients/Grid that shows how to interact with a grid server via regular Web forms. May be good for developing administrative tools.
2009-09-25 07:38:05 -07:00
Justin Clark-Casey (justincc)
613cb417c0
add control files containing version info to iars
2009-09-25 14:52:53 +01:00
Justin Clark-Casey (justincc)
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
Diva Canto
52e477b41f
Better guards on RegisterRegion in GridService.
...
Added serverPort to the fields that get stored (I think this is the UDP port).
2009-09-25 06:02:41 -07:00
Diva Canto
eb0aa6a7f4
Make the grid client deregister the test regions at the end, so that they don't stay in the DB.
2009-09-24 18:48:38 -07:00
Diva Canto
b6824c495c
Deleted the meaningless console commands on the GridService. Will need to add meaningful ones.
2009-09-24 18:28:38 -07:00
Diva Canto
a792933cba
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-24 18:25:28 -07:00
Diva Canto
6a5d7650d0
All tests pass for MySQL/MySQLRegionData.
...
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
2009-09-24 18:23:55 -07:00
Dan Lake
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
dahlia
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
Diva Canto
1faaa0a43a
GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire.
2009-09-24 15:30:00 -07:00
Diva Canto
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
Justin Clark-Casey (justincc)
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
Justin Clark-Casey (justincc)
784e78a9e8
minor: make rest (not comm) modules less noisy if they are disabled
2009-09-24 17:21:47 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e67341f24c
minor: replace xmlprc 'no method found' magic number with constant from xmlrpc library
2009-09-24 15:02:55 +01:00
Justin Clark-Casey (justincc)
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
Diva Canto
2824bbc47b
Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn't conflict with the existing one.
2009-09-24 05:48:35 -07:00
Adam Frisby
ca69fac13e
* Send Updated Information Packet to Clients after updating estate settings.
2009-09-24 22:02:29 +10:00
Adam Frisby
8605c5d2eb
* Establishing why new console commands fail to work. >_>
2009-09-24 21:46:41 +10:00
Adam Frisby
57429423bb
* Fixing typo.
2009-09-24 21:29:57 +10:00
Adam Frisby
71a4b02c7e
* Minor commit, added two new math utility functions.
2009-09-24 20:56:01 +10:00
Adam Frisby
aca9fd182e
* Added two new commands to EstateManagementModule
...
* Also, I hate git.
2009-09-24 20:27:11 +10:00
Diva Canto
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
Diva Canto
fd8fb7735b
First test passes -- regions being registered and retrieved correctly in Data.Null.
2009-09-23 20:39:25 -07:00
Diva Canto
3c19bd5142
Unit tests for the grid service. Yey!
2009-09-23 20:35:16 -07:00
Diva Canto
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
Diva Canto
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
Teravus Ovares (Dan Olivares)
c592a60f46
Fix endlines on UrlModule.cs
2009-09-23 15:00:18 -04:00
Teravus Ovares (Dan Olivares)
9c2ffa8f2e
* fix endlines in LSL_api.cs
2009-09-23 14:55:22 -04:00
Justin Clark-Casey (justincc)
eb892e0545
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-23 18:42:20 +01:00
Diva Canto
35deff7ec4
Modules active. Tested HGGridConnector in standalone only for now. Modules commands work.
2009-09-23 09:27:01 -07:00
Justin Clark-Casey (justincc)
03438f7d44
minor: remove double initialization of user appearance module in Grid.UserServer.Main
2009-09-23 16:24:26 +01:00
Diva Canto
486a9a5b61
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 07:54:13 -07:00
Alan M Webb
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
Diva Canto
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
Adam Frisby
5dc3e560d3
* Makes SimulatorEnable messages 'reliable' and subject to redelivery.
2009-09-23 10:30:18 +10:00
Diva Canto
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
Diva Canto
0fc2b73e7b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-22 14:15:53 -07:00
Diva Canto
34f4738159
Added HGGridConnector and related code.
2009-09-22 11:58:40 -07:00
Melanie
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
Melanie
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
Melanie
c5be401d46
Remove support for executing a handler on poll. It caused other issues
2009-09-22 05:24:22 +01:00
Melanie
06871d51dd
Disable the handler execution for poll services until the ramifications
...
can be studied
2009-09-22 05:13:50 +01:00
Diva Canto
a9ced0fe79
Added Remote grid connector module.
2009-09-21 19:33:56 -07:00
Diva Canto
ae07b220c6
Changed position methods so that they assume the input params are in meters.
2009-09-21 17:16:30 -07:00
Melanie
b6b8a18d37
Add the headers collection to the keysvals for HTT requests
2009-09-21 20:21:01 +01:00
Melanie
61aaf3532a
Add X-PollServiceID pseudo-header to the request handling for polls
2009-09-21 20:10:26 +01:00
Melanie
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
Melanie
5511c62580
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-21 18:12:12 +01:00
Diva Canto
6d0e7b6a6c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-21 11:05:20 -07:00
Diva Canto
390137d540
Added grid handler and grid remote connector.
2009-09-21 11:05:01 -07:00
Melanie
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
Melanie
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
Melanie
2a1b5e3540
A small fix for remote console to accommodate PollServiceArgs behavior a
...
bit better
2009-09-21 14:14:22 +01:00
Diva Canto
9027d4b490
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-20 08:32:51 -07:00
Melanie
f6410882a5
Finish the (untested) authentication connector
2009-09-19 18:18:47 +01:00
Melanie
0c364ee285
Complete the first authenticator method
2009-09-19 18:14:22 +01:00
Melanie
2f624800d3
Adding the deserializer for server form/xml replies
2009-09-19 18:06:25 +01:00
Melanie
2d9d25b367
Add the skeleton of the authentication connector and the forms data requester
2009-09-19 17:33:57 +01:00
Melanie
97ebdd4607
Adding Xml serialization of Dictionary<string, object> where object
...
is either another Dictionary<string, object> or a value that is
convertible to a string.
2009-09-19 16:57:15 +01:00
Diva Canto
462e3a4464
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-19 07:37:19 -07:00
BlueWall (James Hughes)
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
Diva Canto
15d6bb4ce5
Reverted the order of reading configs in GridServiceBase.
2009-09-18 20:09:43 -07:00
Diva Canto
66f8166bd0
First pass at LocalGridServiceConnector. Nothing of this is used by the simulator yet.
2009-09-18 20:01:33 -07:00
Diva Canto
8f133cb46b
Renamed the project lslc to OpenSim.Tools.lslc to conform to the naming conventions so far. Added copyright to it.
2009-09-18 19:28:58 -07:00
Diva Canto
4a55ff88c0
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-18 19:17:02 -07:00
Diva Canto
e736273815
First pass at the grid service.
2009-09-18 19:16:30 -07:00
Justin Clark-Casey (justincc)
967cbde055
correct off-by-one error in save iar command handling
2009-09-18 22:25:32 +01:00
Justin Clark-Casey (justincc)
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
Michael Cortez
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
Michael Cortez
65b9084c65
Add a little debugging for filtered groups lists based on requester
2009-09-18 20:54:01 +01:00
Michael Cortez
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
Michael Cortez
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
Michael Cortez
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
Michael Cortez
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
Michael Cortez
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
Michael Cortez
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
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
Melanie
6461243e7c
Remove the methods for full inventory fetch from the connector. Remove tests
...
for the old, removed asset handlers
2009-09-17 23:55:06 +01:00
Melanie
6779abf7f5
Remove The legacy inventory and asset servers. Bump interface version to 6
2009-09-17 23:39:58 +01: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
Melanie
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
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
Melanie
df7904c58b
Add the Null storage implementation for the RegionData service. Standalones
...
have no regions table, so this is needed
2009-09-16 18:20:08 +01:00
Melanie
5068404505
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-16 17:57:31 +01:00
Justin Clark-Casey (justincc)
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
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
a251864e64
Add the migration for scoping grid data
2009-09-16 17:56:24 +01:00
Melanie
90a4d4f9f9
Adding the MySQL RegionData service.
2009-09-16 17:52:16 +01:00
Melanie
8622f205d7
Database interface tot the new region store
2009-09-16 17:05:35 +01:00
Alan M Webb
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
Alan M Webb
d4c98ddffc
This fix adds a stand-alone compilation environment
...
for OpenSIm scripts. It makes it very easy to address
coding issues before going in-world to try a script
out. This is a HUGE time saver if you're doing
anything significant with scripts.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-16 16:43:51 +02:00
Alan M Webb
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
Alan M Webb
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
Melanie
c5455d4fe7
And another go
2009-09-15 08:24:51 +01:00
Melanie
cec296543c
Attempt to fix the tests
2009-09-15 08:12:53 +01: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)
1ad35f65b3
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-14 16:30:36 -04:00
Teravus Ovares (Dan Olivares)
dc925416d7
* fix missing lock on XMLRPC GroupsModule
2009-09-14 16:30:14 -04:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5a64ca4642
label load and save iar commands as experimental.
2009-09-14 16:57:47 +01:00
Justin Clark-Casey (justincc)
dd4d70eafe
re-enable load and save iar commands
2009-09-14 16:54:36 +01:00
dr scofield (aka dirk husemann)
19c5c8b98d
fix to preserve UTF8 encoding in saved script state.
2009-09-14 16:14:59 +02:00
Teravus Ovares (Dan Olivares)
feccfe4096
* Add the RegionCombinerModule back
...
* Yay anonymous delegate in an anonymous delegate.
2009-09-13 19:09:48 -04:00
Teravus Ovares (Dan Olivares)
3a9e1cf0a3
Temporarily removing the RegionCombinerModule to debug a mono assert on linux
2009-09-13 18:43:20 -04: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
Teravus Ovares (Dan Olivares)
3562d75c17
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 18:12:44 -04:00
Teravus Ovares (Dan Olivares)
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
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
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
Melanie
cfa0cbdffa
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-11 21:53:16 +01:00
Diva Canto
c8ddc5b301
Changed GetRegionByHandle to GetRegionByPosition -- more generic.
2009-09-11 13:55:23 -07:00
Melanie
496b368334
Add a using() block around the timer script
2009-09-11 21:52:49 +01:00
Diva Canto
5de1ec735c
Added GetRegionByHandle.
2009-09-11 13:17:37 -07:00
Diva Canto
f6c4221a0d
Removed RequestLandData from IGridService because it's already in another place.
...
Moved GetMapBlocks to a new interface IMapService.
2009-09-11 13:08:43 -07:00
Diva Canto
8fd604dcd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-11 12:55:25 -07:00
Diva Canto
44343ed94d
Changed names of methods in IGridService.
2009-09-11 12:54:58 -07:00
Justin Clark-Casey (justincc)
c573a32529
Disable non-user ready load/save iar for now pending possible format change
2009-09-11 20:38:08 +01:00
Justin Clark-Casey (justincc)
f20a052ef5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-11 18:20:41 +01:00
Rob Smart
44f1092b83
moved AuthorizationRequest and AuthorizationResponse to IAuthorizationService to keep service dependencies together.
2009-09-11 09:23:09 -07:00
Justin Clark-Casey (justincc)
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
Diva Canto
ca0810a103
Minor indentation cleanup.
2009-09-11 06:59:10 -07:00
Rob Smart
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
Diva Canto
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
Rob Smart
b5c8925fdf
added AuthorizationRequest and AuthorizationResponse objects for passing Authorization messages over http. Added handling code for these in the AuthorizationServerConnector and AuthorizationServicesConnector
2009-09-10 17:53:05 -07:00
Rob Smart
953ef780c5
adding in working functionality for the remote connector
2009-09-10 17:52:42 -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)
eabf5b6c3d
refactor: Replace some iar item name generation in tests with helper function
2009-09-10 17:40:07 +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)
729fbee287
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 04:07:08 -04: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
Jeff Ames
c41387b864
Formatting cleanup.
2009-09-10 15:57:53 +09:00
Teravus Ovares (Dan Olivares)
656de67d85
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 00:31:32 -04:00
Teravus Ovares (Dan Olivares)
dc3798ddc3
* Another Timer lock
2009-09-10 00:31:14 -04:00
Melanie
0034dd043f
Many databases contain folders with invalid folder ID. Folder IDs are
...
supposed to be within -1 .. 22 and other values break inventory loading.
This patch fixes it and allows inventory to load. Invalid folder types
will be treated as ordinary folders.
2009-09-10 00:33:00 +01: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
Diva Canto
5bf288745d
De-hardcode default home locations on create user (standalone).
2009-09-09 11:02:31 -07:00
Justin Clark-Casey (justincc)
0cdec1fbc3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-09 18:11:02 +01: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
Justin Clark-Casey (justincc)
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
dr scofield (aka dirk husemann)
62358014ed
reformatting.
2009-09-09 09:56:07 +02:00
dr scofield (aka dirk husemann)
d8a787bd89
fix: unicode notecards not surviving script treatment ( fixes #4119 ---
...
perhaps).
2009-09-09 09:56:07 +02:00
Melanie
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
Justin Clark-Casey (justincc)
2bb2a0ec44
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-08 17:50:45 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
36a40e0295
refactor: change method argument name
2009-09-08 16:29:31 +01:00
Justin Clark-Casey (justincc)
46d64da830
minor: remove warning
2009-09-08 16:14:52 +01:00
Justin Clark-Casey (justincc)
76b21860e9
refactor iar name generation
...
slightly change the format of item archive names
2009-09-08 16:12:15 +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
dahlia
665cf0194a
llRot2Euler() now returns angles -PI < angle < PI
2009-09-07 18:02:02 -07:00
dahlia
7a67b726d5
random drive-by maths optimization in llRot2Euler() and llEuler2Rot()
2009-09-07 17:12:17 -07: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
Justin Clark-Casey (justincc)
71f1628578
make oar module logging a little less noisy
2009-09-07 19:11:16 +01:00
Justin Clark-Casey (justincc)
10b075a33d
change default iar filename
2009-09-07 18:42:53 +01:00
Justin Clark-Casey (justincc)
b061f2a3b0
oops, disable T012_EstateSettingsRandomStorage() again since it does appear to fail occasionally
2009-09-07 18:39:23 +01:00
Justin Clark-Casey (justincc)
116933bee5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-07 18:26:53 +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
Melanie
a6e2e94345
Thank you, StrawberryFride, for a hit-and-run patch to add authentication
...
and user services to MSSQL
2009-09-06 23:05:06 +01:00
Justin Clark-Casey (justincc)
fc8efc1667
T012_EstateSettingsRandomStorage() which wasn't being run because the method was private
...
test appears to work, so method made public to run in tests
2009-09-06 22:09:19 +01:00
Justin Clark-Casey (justincc)
61c286f5d6
change iar load to make discrete inventory service requests rather than the cache
2009-09-06 22:07:35 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
a92afe8dca
change load iar test to use non-cache find item by path function
2009-09-06 21:26:27 +01:00
Justin Clark-Casey (justincc)
d8316810a1
remove now unnecessary parts of save iar test
2009-09-06 21:20:41 +01:00
Teravus Ovares (Dan Olivares)
8797a82098
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-06 16:15:20 -04:00
Justin Clark-Casey (justincc)
1cc0c94f79
remove warning
2009-09-06 21:15:18 +01:00
Teravus Ovares (Dan Olivares)
511bddc8bc
* Moves another Legacy avatar inbounds check to Border
2009-09-06 16:15:06 -04:00
Justin Clark-Casey (justincc)
881051c8cc
Convert iar write request to use inventory service requests rather than cache
2009-09-06 21:14:42 +01:00
Justin Clark-Casey (justincc)
766d775625
remove warning
2009-09-06 20:17:30 +01:00
Justin Clark-Casey (justincc)
79c22651d7
refactor: use direct scene reference in inventory archive read request
2009-09-06 20:16:56 +01:00
Justin Clark-Casey (justincc)
8616230fcf
refactor: replace some uses of iar module reference with scene instead
2009-09-06 20:04:18 +01:00
Justin Clark-Casey (justincc)
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
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
67d9a6bcc1
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-06 15:55:57 +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
Adam Frisby
5e4b7be712
* Typo in previous commit.
2009-09-06 21:53:03 +10:00
Adam Frisby
25313c2105
* Debugging why region loading is occurring so slowly on a setup with 64 regions in a Regions.ini (took 38 minutes on my test box)
2009-09-06 21:52:11 +10:00
Melanie
bb1d4d23c4
Change the loader to actually load the user service data module
2009-09-06 04:44:08 +01:00
Melanie
2303945b4e
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-06 04:29:21 +01:00
Melanie
2a8f66b221
Revising the user account data interfaces. No user functionality yet
2009-09-06 04:28:42 +01:00
Diva Canto
babe392709
uh-hum. It might help if I remembered to save the file.
2009-09-05 17:16:43 -07:00
Diva Canto
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
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
Justin Clark-Casey (justincc)
4c560df8ac
If running tests manually, fail immediately on error
2009-09-04 19:22:09 +01:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
d49ee1f8ab
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-04 04:26:14 -04:00
Teravus Ovares (Dan Olivares)
f7861a6bad
* Make the RegionCombinerModule also register to handle permissions for the virtual region scenes.
2009-09-04 04:25:56 -04:00
dr scofield (aka dirk husemann)
f23f7b1fc4
preparing LandData seriali(s|z)ation into OAR [not yet functional]
2009-09-04 10:12:36 +02:00
Melanie
67f803c919
Add the new AuthStore to migrations. Update OpenSim.Server.ini
2009-09-04 08:10:05 +01:00
Melanie
ac40c7a74c
Fully implement unencrypted auth token operations
2009-09-04 07:48:09 +01:00
Teravus Ovares (Dan Olivares)
b93f512433
* Fix for GetTerrainHeightAtXY to make it compatible when Constants.RegionSize isn't 256
2009-09-04 02:48:07 -04:00
Melanie
548f508044
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-04 07:04:36 +01:00
Melanie
11700ba4a4
Implement plain password authentication partway. Tested, but no user
...
functionality yet.
2009-09-04 07:03:43 +01:00
Teravus Ovares (Dan Olivares)
9f05edab04
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-04 00:04:26 -04:00
Teravus Ovares (Dan Olivares)
bb5857c4bb
* Fixes the function 'GetTerrainHeightAtXY'
2009-09-04 00:03:54 -04:00
Melanie
c9a24ece54
More work on new authentication service
2009-09-04 03:13:32 +01:00
Melanie
e39d0ef627
Flech out the Authentication service. Add the database loader. Introduce
...
inheritance to deal with common tasks like crypto.
Still untested.
2009-09-04 00:55:21 +01:00
Melanie
90262d4092
Add the user authentication data adapter. This is meant to use a new table
...
schema, but can read the old ones for compatibility. It should not be used
to write to the old tables unless you know what you're doing!
This is untested and will probably not work.
2009-09-04 00:23:26 +01:00
Melanie
5c2bf97bf2
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-03 21:04:06 +01:00
Melanie
328fd104e1
Remove the distinction between password and login key in the authentication
...
service. This will be done in the login service instead, it's out of
scope for an authenticator
2009-09-03 21:03:04 +01:00
Diva Canto
639bf79aec
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-03 12:42:25 -07:00
John Hurliman
33133e23b1
Fixes seven leaky .BeginInvoke() calls
2009-09-03 12:36:51 -07:00
John Hurliman
584c113836
Added Util.FireAndForget(), to replace leaking calls to Delegate.BeginInvoke()
2009-09-03 12:27:23 -07:00
Justin Clark-Casey (justincc)
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
Chris Hart
c4ae9413f1
MSSQL Minor tweak to recent patch for region loading (Thanks Grumly57 for spotting it!)
2009-09-03 19:07:50 +01:00
dahlia
6cf610bc44
eliminate unnecessary storage of mesh objects which are no longer necessary after recent startup optimizations
2009-09-02 17:40:55 -07:00
Chris Hart
4841858600
MSSQL patch to mirror mantis 4077 for MySQL to improve region load times
2009-09-02 19:42:18 +01:00
Jeff Ames
56ddd6828c
Add copyright headers. Formatting cleanup.
2009-09-03 02:04:17 +09:00
Melanie
8e7b385883
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-02 16:29:50 +01:00
Melanie
65d7644993
Correct the icons on wearables in agent inventory. To fully correct the issue
...
immediately, run
update inventoryfolders set version=version+1;
2009-09-02 16:27:08 +01:00
dr scofield (aka dirk husemann)
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
dr scofield (aka dirk husemann)
05756e1fb9
warnings safari.
2009-09-02 11:06:18 +02: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
994c5e2094
Prevent the Viewer's threaded inventory retrieval causing a OOM and overload
...
the inventory server by serializing upstream requests.
2009-09-02 05:04:24 +01: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
Teravus Ovares (Dan Olivares)
2fc3f61a42
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-01 19:39:07 -04:00
Teravus Ovares (Dan Olivares)
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
dr scofield (aka dirk husemann)
47e0024238
adding new IniConfigSource() to SceneSetupHelpers to fix empty
...
IConfigSource causing grief to region modules expecting it to be
non-empty (which a number of them do).
2009-09-01 11:33:10 +02:00
dr scofield (aka dirk husemann)
39726f0fda
switching SerialiserModule to "new" region module scheme
2009-09-01 10:28:29 +02:00
dr scofield (aka dirk husemann)
ef6c0bd7d8
cleanup.
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
Melanie
c89fc36f28
Applying Mantis #4079 . Thank you, dslake
2009-09-01 02:17:08 +01: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)
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
Teravus Ovares (Dan Olivares)
b997174d08
* Fix attachment cross issues with new borders.
2009-08-31 20:07:33 -04:00
Teravus Ovares (Dan Olivares)
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
dr scofield (aka dirk husemann)
27b378ca8b
switching Archiver to "new" region module scheme
2009-08-31 17:25:16 +02:00
dr scofield (aka dirk husemann)
3581b9abce
Merge branch 'regionready' into opensim
2009-08-31 15:02:21 +02:00
dr scofield (aka dirk husemann)
3195af39a7
cleaning up RegionReadyModule:
...
- wrong namespace
- converted to "new" region module
2009-08-31 14:59:28 +02:00
Melanie
9e6684661a
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-31 11:58:49 +01:00
Melanie
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
dr scofield (aka dirk husemann)
5209305615
oops. fixing missing argument.
2009-08-31 12:05:14 +02:00
dr scofield (aka dirk husemann)
86521adb7e
adding log message to vector render to inform about default font being used
2009-08-31 11:35:49 +02:00
dr scofield (aka dirk husemann)
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
Jeff Ames
bbef5c344e
Remove typo version of ReplaceableInterface property from RegionCombinerModule.
2009-08-31 14:16:16 +09:00
Melanie
d2eba2cf22
Recreate the shell of the AuthenticationService to squelch Windows build
...
error. WIll be filled in as soon as I figure out the crypto stuff.
2009-08-31 01:03:14 +01: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)
efe737b895
Ok, merging the RegionCombinerModule with master.
2009-08-29 23:49:48 -04:00
Teravus Ovares (Dan Olivares)
33f36c9010
* Rename the RegionCombiner Module from PhysicsCombiner
2009-08-29 23:39:27 -04:00
Melanie
07e8907569
Remove another IAuthentificationInterface user
2009-08-30 03:27:09 +01: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)
3ccf3aba89
* Fixes looking up parcel permissions in virtual regions.
2009-08-29 16:24:03 -04:00
Melanie
5b06079a83
Remove a user of the old auth interface
2009-08-29 17:49:58 +01:00
Melanie
dce04df4f2
Redesign the IAuthenticationService interface to use PKI. Sessioning is
...
now in the domain of the presence module where it belongs.
2009-08-29 17:37:41 +01: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
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
Melanie
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
Melanie
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
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
Arthur Valadares
3d6edc04a3
Implements osDrawPolygon, similar to already implemented osDrawFilledPolygon
2009-08-28 17:48:03 -03: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)
33004b613d
Standardize FlotsamAssetCache header
...
Add mcortez to CONTRIBUTORS
Other minor tidy of CONTRIBUTORS
2009-08-28 18:12:30 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
7ff4c2e50b
Pull out distinct cache system folders and drop cache methods in InventoryCache
2009-08-28 17:07:17 +01:00
Justin Clark-Casey (justincc)
7f8df4242b
Correct build break
2009-08-28 12:58:10 +01:00
Justin Clark-Casey (justincc)
d649194be3
minor: formatting and comments
2009-08-28 12:52:40 +01:00
Justin Clark-Casey (justincc)
cf58c0ab08
minor: remove some commented out iar test code
2009-08-28 12:01:21 +01:00
Teravus Ovares (Dan Olivares)
65dda8a795
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-27 19:36:52 -04:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
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
Melanie
8a9d168928
Add try/catch around EQ request processing
...
Fixes Mantis #4061
2009-08-26 14:46:10 +01:00
Jeff Ames
cf2d1b5c10
Add copy constructor to PhysicsVector.
2009-08-26 14:28:54 +09:00
Jeff Ames
02f937b0dc
Fix some compile warnings.
2009-08-26 14:02:52 +09:00
Jeff Ames
256624566f
Formatting cleanup, minor refactoring.
2009-08-26 14:02:01 +09:00
Teravus Ovares (Dan Olivares)
5f794d3e59
A slightly modified version of
...
http://opensimulator.org/mantis/view.php?id=4040 by jhurliman. The patch didn't match up, so I winged it here. My effort to manually merge the patch seems to make sense, so I'm going to commit it.
2009-08-25 17:36:04 -04:00
Arthur Valadares
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
Arthur Valadares
9c9fa51b0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
2009-08-25 10:28:22 -03:00
Diva Canto
cfd9cf7b18
Closed the web request and stream in SynchronousRestSessionObjectPoster -- maybe this is the cause of some timeouts seen in some monos?
2009-08-25 06:17:36 -07:00
Melanie
1e4238af92
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-22 20:18:56 +01:00
Melanie
a22b12ecd4
Change prompt handling in console. No user changes
2009-08-22 20:18:24 +01:00
Diva Canto
71f2d8391b
Moved a debug message.
2009-08-22 10:30:27 -07:00
Diva Canto
751c2000cc
Changed the namespace of old InventoryServiceBase amd AuthedSessionCache.
2009-08-22 10:30:04 -07: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
8ef758d826
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-22 09:04:25 -07:00
Diva Canto
75021b5309
Moved AuthedSessionCache to where it is used -- Grid/InventoryServer.
2009-08-22 09:03:59 -07:00
Arthur Valadares
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
Arthur Valadares
173701dd63
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-21 17:52:25 -03:00
Arthur Valadares
604ef5ba79
Fix issue where conversion of temporary boolean variable fails on MySQL
2009-08-21 17:48:45 -03:00
Diva Canto
f9ee8be2bc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-21 11:01:23 -07:00
Diva Canto
3318652723
Added a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObjectRequester so that it also understands PUTs.
2009-08-21 11:00:45 -07:00
Teravus Ovares (Dan Olivares)
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
Melanie
de3cca6061
Fix Messaging server so -xmlfile actually works
2009-08-21 17:00:18 +01:00
Melanie
7daf6dbbd3
Add -xmlfile= option to UGM, to let the files be outside bin if desired
2009-08-21 11:35:40 +01:00
Jeff Ames
158ad39df0
Add copyright header. Formatting cleanup.
2009-08-21 15:47:55 +09:00
Diva Canto
31e7e1b5f9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 22:37:06 -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
bd7757de22
* oops. Mistake with value return.
2009-08-21 15:15:15 +10:00
Adam Frisby
f7c5eca978
* Moves NPC Creation across AppDomains to prevent a major perfomance issue.
2009-08-21 15:12:50 +10:00
Diva Canto
9e64427262
Putting the inventory packets back to ThrottleOutPacketType.Asset, because that didn't work.
2009-08-20 21:56:06 -07:00
Diva Canto
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
Adam Frisby
98da8e9b16
* Make cache, actually cache.
2009-08-21 14:20:05 +10:00
Adam Frisby
29e2067ec3
* Implements a cache in NPCModule for Appearance.
2009-08-21 14:10:21 +10: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)
64dcb71c14
* Fixes Terrain issues with combined regions.
2009-08-20 23:26:40 -04:00
Teravus Ovares (Dan Olivares)
c9b52cd0b6
* Adds PhysicsCombiner Module
...
* May rename this later
2009-08-20 23:25:40 -04:00
Adam Frisby
bce98f9670
* Fixing an issue with NPC's and Circuit Codes.
2009-08-21 13:12:51 +10:00
Adam Frisby
7ef3e5f41c
* Protip: Declare publically accessible functions, as public functions.
2009-08-21 11:43:45 +10:00
Adam Frisby
c7e140171e
* Addendum to previous
2009-08-21 11:35:19 +10:00
Adam Frisby
1740fd60b3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-21 11:15:48 +10:00
Adam Frisby
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
Melanie
ea32600b8b
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-21 00:26:49 +01:00
Teravus Ovares (Dan Olivares)
181b992b4a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-20 19:25:52 -04:00
Melanie
70c870972a
Fix the user and password defaults int he remote console setup
2009-08-21 00:25:50 +01:00
Teravus Ovares (Dan Olivares)
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
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
a3d895908f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 16:19:02 -07:00
Diva Canto
118f710a79
Fixed a missing field in SendBulkInventoryFolderUpdate.
2009-08-20 16:18:32 -07:00
Adam Frisby
e83b00a3df
* Implements a bunch of stuff in NPCModule
2009-08-21 08:51:43 +10:00
Melanie
b23160a871
Remove the AssetInventory server from core. It has fallen behind both
...
upstream and the reference implementation to the point where it is no
longer usable. It has no known users, and sinnce it doesn't work anymore,
it is safe to assume that no one has used it in a long time.
2009-08-20 21:45:49 +01:00
Melanie
297393f349
Remove a load-order dependency in inventory transfer that was biting
...
Windows users
2009-08-20 21:05:00 +01:00
Melanie
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
John Hurliman
ae2ceda479
* Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a valid TextureEntry. About half the time update_avatar_appearance calls are made, the TextureEntry is empty
2009-08-20 10:32:38 -07: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
a3db2936f7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 17:36:34 -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
Kunnis
b1853d9f26
Fixing a spot I missed in assets. Switching Grid to the new naming schema with Store/Get
2009-08-19 23:46:25 +01:00
Kunnis
f1287cc7af
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
2009-08-19 23:45:22 +01:00
Diva Canto
c295354ea0
Fixes GetRootFolder for normal standalone, which was being incorrectly redirected to the wrong object. Probably fixes most grief in
...
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 16:15:04 -07:00
Diva Canto
51e487a172
Makes the inventory connectors fully compatible with the old Grid.InventoryServer.
...
WARNING: interacting with the old server is _much_ slower than interacting with the new one. Grids with the old server will not see any improvements on crossings and TPs, because inventory needs to be fetched from it in its entirety.
2009-08-19 12:02:57 -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
4818d11b9d
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 00:31:51 -07:00
Diva Canto
c5af39239f
A better purge of trash folder.
2009-08-19 00:13:51 -07:00
Diva Canto
e5f33e7505
GetFolderItems implemented. It's not being called, but it might.
2009-08-18 22:36:03 -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
Melanie
2111c66f89
Graft the REST console onto the message server as well. What a dirty hack!
...
Works the same as the others.
2009-08-19 05:40:23 +01:00
Melanie
dd0234f500
Graft the REST console onto the grid server. Same procedure as with
...
the user server.
2009-08-19 05:15:25 +01:00
Melanie
c5bbcb04e0
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-19 04:40:57 +01:00
Melanie
99c7a43ffd
Add rest console support to the user server. Will ask new questions at
...
startup. To use, run it normally once, answering the questions, then
run again with -console=rest.
Also now supports -console=basic for a console that reads stdin
2009-08-19 04:39:02 +01:00
Jeff Lee
32cc00ec7b
osGetLinkPrimitiveParams fix
2009-08-18 20:05:27 -07:00
dahlia
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
Teravus Ovares (Dan Olivares)
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
Teravus Ovares (Dan Olivares)
c54cb59a71
* Some Physics Scene Changes to prepare for larger regions
2009-08-18 11:05:07 -04: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
806f48d81a
Added one conditional missing on login, for creating inventory if it doesn't exist already. This hopefully fixes the master avatar problems on standalone.
2009-08-17 17:00:27 -07:00
Diva Canto
d7aa622050
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 15:28:16 -07:00
Diva Canto
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
Diva Canto
3a3f9d5abb
Added some padding to the remote inventory connector so that it tries to operate with the old Grid.InventoryServer.exe. Untested, but it should work -- slow.
2009-08-17 14:14:22 -07:00
Melanie
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
Diva Canto
59b4cf2d5b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 13:27:22 -07:00
Justin Clark-Casey (justincc)
0d7bcee560
no-op to poke panda
2009-08-17 20:25:14 +01:00
Justin Clark-Casey (justincc)
4a992388e3
Apply http://opensimulator.org/mantis/view.php?id=4016
...
Make previously hidden cookies available to code
Thanks jhurliman
2009-08-17 20:02:42 +01:00
Justin Clark-Casey (justincc)
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
Adam Frisby
95bb22f883
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:59:05 +10:00
Adam Frisby
30c4aa55e6
Added additional configuration options for MRM Security. See OpenSim.ini.example under the [MRM] section.
2009-08-18 00:58:42 +10:00
Teravus Ovares (Dan Olivares)
f34e89f385
* More Test tweaking to get down to the root cause of the test wierdness
2009-08-17 10:28:58 -04:00
Adam Frisby
58d9d6026e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:23:27 +10:00
Adam Frisby
8c101d24df
* Implementing a bunch of Unimplemented MRM stubs.
2009-08-18 00:23:02 +10:00
Diva Canto
94cd4c136c
Bumping the interface number down again, because this *may* not be a breaking change with older sims.
2009-08-17 06:41:26 -07:00
Diva Canto
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
Melanie
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
Melanie
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
Melanie
dc0f0f5da8
Limit the scrollback buffer output of the command line client to
...
100 lines (4 screens worth) so things don't scroll endlessly on connect
2009-08-17 08:56:40 +01:00
Melanie
cef16bec6d
Add the OpenSim.ConsoleClient app.
...
Usage: OpenSim.ConsoleClient -h <host> -p <port> -u <user> -P <pass>
host defaults to localhost, port defaults to 8003.
2009-08-17 08:45:20 +01:00
Melanie
b05539e7cf
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-17 05:01:23 +01:00
Melanie
002940dd5d
Filling in the blanks: The "meat" of the REST console
2009-08-17 05:00:30 +01:00
Diva Canto
052c51f90f
Bumped up grid services interface number.
2009-08-16 20:38:30 -07:00
Diva Canto
67a629081e
uh. how about *really* removing it, and not just write a comment above, hey diva?
2009-08-16 19:54:49 -07:00
Diva Canto
87f116ab3a
Remove the call to ResetAttachments upon login. The info in the DB should always have {itemID, assetID}.
2009-08-16 19:51:16 -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
Teravus Ovares (Dan Olivares)
bf8e07606f
* handle litjson errors for now. We'll remove this when we hear back from http://jira.openmetaverse.org/browse/LIBOMV-675
2009-08-16 17:19:52 -04:00
Kunnis
dd78c250ae
* Added Expression based ignores to the PropertyScrambler, which makes a lot of the tests clearer because I'm not constantly resetting properties.
2009-08-16 14:34:16 -04:00
Kunnis
5dde4a4cfa
* More improvements to BasicAssetTest.cs
2009-08-16 14:26:43 -04:00
Kunnis
d2e5380cb2
* Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra parameter from MySQL/MySQLInventoryData.cs * Fixed a bug in SQLite/SQLiteAssetData.cs that was causing a NRE when updating an asset. * Improved the BasicAssetTest.cs to do full create/update/get testing * Improved the BasicInventoryTest.cs to do full create/update/get of both a folder and an item * Moved the null ref tests to the start of the PropertyCompareConstraint.cs, so that it doesn't throw when passing in a null item
2009-08-16 14:17:29 -04:00
Kunnis
f6251ce810
* Modified SQLite/SQLiteInventoryStore.cs to not throw if the inventory row does not exist, to match the mysql behavior. * Modified SQLite/SQLiteRegionData.cs to only persist temporary items following the same rules mysql uses. * Added another ignore to the inventory test that was missing. * Added a few more ignores to the RegionTest that the first version of my test were missing. * Added ignoring the root Folder ID, which is set by the inventory system. * Added several improvements to the PropertyCompareConstraint: Protection against infinite loops, added IComparable<T> (for UUID) and moved IComparable before the property matching. * Fixed a bug where I was saving the inside of the ignore expression instead of the outside of it.
2009-08-16 14:15:59 -04:00
Kunnis
23d478f2fa
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-16 13:35:44 -04:00
Jeff Ames
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00
Jeff Ames
ad02aefaee
Fix argument index in log4net call. ( fixes #4003 )
2009-08-17 01:46:00 +09:00
Adam Frisby
e5b94346b6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-17 02:25:24 +10:00
Adam Frisby
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
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
Teravus Ovares (Dan Olivares)
4eeab4097a
* minor: comments
2009-08-16 12:10:06 -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
Adam Frisby
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
Adam Frisby
c2be3edd2d
* Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of IAvatar.cs
2009-08-16 21:49:53 +10:00
Adam Frisby
b28e826541
* Implements ISecurityCredential on all uses of SOPObject.cs except Avatar Attachments.
2009-08-16 21:41:57 +10:00
Adam Frisby
adae13cd18
* [MRM] Added permission checks to MRM Events (ie, requires edit permission to bind to OnTouch)
2009-08-16 21:36:33 +10:00
Adam Frisby
8621dc405e
* Fixes potential NulRef in MRM Security Checks.
2009-08-16 21:23:39 +10:00
Adam Frisby
aea4d7c63b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 21:21:38 +10:00
Adam Frisby
975c49a399
* [MRM] Implements permission checks on IObject implementations in SOPObject.cs. Does not implement security on IObjectInventory yet.
2009-08-16 21:20:45 +10:00
Jeff Ames
2b630470b0
Add copyright headers. Formatting cleanup.
2009-08-16 17:30:13 +09: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
710a15845c
Merge branch 'master' into inventory-connector
2009-08-15 15:08:04 -07:00
Diva Canto
19e45466f2
Changed one word in a comment
2009-08-15 14:57:24 -07:00
Melanie
973be65945
Merge branch 'master' of ../opensim-diva/ into inventory-connector
2009-08-15 19:00:56 +01:00
Adam Frisby
8b6d79aa3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 03:50:12 +10:00
Adam Frisby
9090a90769
* Beginnings of a Security Credential system in MRM. This will eventually lead to trusted execution of untrusted MRMs.
2009-08-16 03:48:16 +10:00
Teravus Ovares (Dan Olivares)
30ce56e721
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-15 13:10:21 -04:00
Teravus Ovares (Dan Olivares)
8000812700
* part one of adding physics combining
2009-08-15 13:10:10 -04: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)
ddac88da6a
* whoops, missing a /
2009-08-15 00:29:34 -04:00
Teravus Ovares (Dan Olivares)
72c2819c53
* Comment out XEngineTest that doesn't appear to test anything. It just creates a scene named 'My Test' which just happens to be the last scene displayed in the nunit log before it goes boom.
2009-08-15 00:22:18 -04: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
Justin Clark-Casey (justincc)
e17a2331a0
* Re-enable TestLoadIarV0_1ExistingUsers()
2009-08-14 20:38:56 +01:00
Justin Clark-Casey (justincc)
ff28ecee1b
Re-enable TestSaveIarV0_1()
...
Implement more parts of TestAssetService
2009-08-14 20:07:13 +01:00
Justin Clark-Casey (justincc)
3e94eecc5c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-14 20:00:24 +01:00
Justin Clark-Casey (justincc)
a668a5b0d3
Add standard doc and standard doc formatting to IAssetService
2009-08-14 19:59:42 +01:00
Diva Canto
46116864b9
Returning UUID.Zero is scene and user profile service are null in GetSession. This doesn't fix the underlying problem of these things being null -- they shouldn't be.
2009-08-14 11:50:42 -07:00
Diva Canto
bb513c1d88
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
2009-08-14 11:32:25 -07:00
Teravus Ovares (Dan Olivares)
7554641703
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 14:16:02 -04: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
Justin Clark-Casey (justincc)
957962b482
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
2009-08-14 19:06:24 +01:00
Justin Clark-Casey (justincc)
31820b0026
minor formatting adjustments
2009-08-14 18:36:09 +01:00
Diva Canto
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07:00
Kunnis
c18f7560d9
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-14 18:15:25 +01:00
Diva Canto
70d7c97e94
Doing session lookup in the right way.
2009-08-14 09:57:18 -07:00
Diva Canto
332d1b5f2f
Additional debug messages, and bug fix in RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set.
2009-08-14 08:43:46 -07:00
Melanie
a851b68333
Remove one more sponsor reference
2009-08-14 14:27:56 +01:00
Melanie
7a2a2e68e7
Remove the script sponsor logic because scripts are timing out again.
...
This needs to be looked into. This commit, unfortunately, reinstates
a memory leak in regions that see significant script fluctuation,
e.g. lots of scripted attachments, or script development.
2009-08-14 14:18:56 +01:00
Teravus Ovares (Dan Olivares)
6ece8d86e0
Deal with possible race in TestAddNeighborRegion in ScenePresenceTests
2009-08-13 23:06:29 -04:00
Teravus Ovares (Dan Olivares)
02f55ff9bd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 22:12:57 -04:00
Teravus Ovares (Dan Olivares)
0781ac9a5e
* Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing a thread, a dead thread, and a null Thread
...
* Fix a null thread situation
2009-08-13 22:12:37 -04:00
Diva Canto
21b5ebdc1f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 19:11:38 -07:00
Teravus Ovares (Dan Olivares)
7a761560c6
* Add AgentCircuitManager tests for adding, removing, changing circuit code, and authentication.
2009-08-13 21:01:39 -04:00
Diva Canto
ded76723eb
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 17:45:17 -07:00
Melanie
73b0cf492d
Add some extra info to script load messages
2009-08-14 01:35:14 +01:00
Diva Canto
034c9cf606
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
2009-08-13 17:34:15 -07:00
Teravus Ovares (Dan Olivares)
f5fc5226f8
* Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test.
2009-08-13 18:10:09 -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
Teravus Ovares (Dan Olivares)
9bcca3dc95
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 12:39:46 -04:00
Teravus Ovares (Dan Olivares)
5b325f1f54
* minor: comments
2009-08-13 12:39:33 -04:00
Diva Canto
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
Melanie
3669115d60
Some small fixes
2009-08-13 13:25:33 +01:00
Melanie
0f3f2e1dc0
Add reference to the profile module in the avatar profiles handler, plus
...
an example of how to override legacy core data with data retrieved from
the profile module
2009-08-13 13:19:12 +01:00
Melanie
94dfe2a20d
Add a profile module interface for the client view to use
2009-08-13 13:05:27 +01:00
Jeff Ames
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
Diva Canto
b0292d59a5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-12 20:40:49 -07: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
Teravus Ovares (Dan Olivares)
0a85d1d767
minor:comments
2009-08-12 23:34:12 -04:00
Teravus Ovares (Dan Olivares)
18634e9dd8
minor: comments
2009-08-12 23:18:00 -04:00
Teravus Ovares (Dan Olivares)
6c1adbf9a5
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-12 22:55:21 -04:00
Teravus Ovares (Dan Olivares)
b47e405420
* minor: Comments
2009-08-12 22:54:57 -04:00
Jeff Ames
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09: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
b3b506cba2
Better test for dropping inventory cache and writing out debug messages.
2009-08-12 09:31:33 -07:00
dr scofield (aka dirk husemann)
613e6f07fc
change 535cb0efc
so that the default LLSD serialization format is
...
llsd+xml instead of llsd+json --- the latter seems to break existing
bots. this assumes that those bots that want llsd+json will properly
signal that desire, if that is not the case, we need to revisit
this. fixes mantis #3977 .
2009-08-12 14:49:59 +02: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
Diva Canto
41839efcc5
Some more hammering on the head of the obsolete rest inventory handlers, just to make this work.
2009-08-11 14:52:17 -07:00
Diva Canto
bd7ff803fe
Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST.
2009-08-11 14:31:45 -07:00
Diva Canto
dae9a111aa
Added new operations to mock inventory service in tests.
2009-08-11 13:16:53 -07:00
Diva Canto
bf3f376b10
Fixed test for detecting when user is no longer in sim.
2009-08-11 12:55:46 -07:00
Diva Canto
08544e576d
Disabling the remote call for the time being, so that I can test it on a grid before making it live.
2009-08-11 12:48:19 -07:00
Diva Canto
764ec7ba0a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-11 12:31:02 -07:00
Diva Canto
e3dbd0e049
Added http handlers for the two new inventory operations.
2009-08-11 12:30:28 -07:00
Justin Clark-Casey (justincc)
fdd0ce68b3
Do new inventory module setup, which is why the test was failing (not the original race condition, hopefully!)
...
Still always catching the NRE for now pending analysis
2009-08-11 20:09:35 +01:00
Diva Canto
dc897b2288
Merged with origin, and resolved one conflict in LoginServiceTests.cs
2009-08-11 10:51:49 -07:00
Diva Canto
263f32a493
Improved test for system folders. Removed log messages.
2009-08-11 10:42:44 -07:00
Diva Canto
31419a70ce
System folders inventory cache added to OUT inventory modules. This tracks agents in and out of *sims* in order to fetch/drop their system folders from the cache. Also added region-side support for fetching the system folders from the inventory service. Nothing of this is called yet.
2009-08-11 10:30:03 -07:00
Justin Clark-Casey (justincc)
2dbdb7e036
Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on the NRE for now
...
Add temporarily logging for diagnosis
2009-08-11 17:49:52 +01:00
Justin Clark-Casey (justincc)
655438a59d
Apply http://opensimulator.org/mantis/view.php?id=1448
...
Store and retrieve user profile url at runtime
Not yet persisted
Thanks Fly-Man
2009-08-11 17:29:15 +01:00
Justin Clark-Casey (justincc)
a52b5e46c0
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-11 17:10:22 +01:00
Chris Down
bb64906a9c
Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
...
git log -n 1 --pretty="format:%h: %ci" > bin/.version
This command can also be run manually to create the bin/.version file.
This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H
The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
Justin Clark-Casey (justincc)
f9b60f5c34
Disable test again. Ho hum.
2009-08-11 17:05:01 +01:00
Justin Clark-Casey (justincc)
39c9f681ab
re-enable just TestReplicateArchivePathToUserInventory() for now to find out if the race condition has been vanquished
2009-08-11 16:55:45 +01:00
Justin Clark-Casey (justincc)
226c082ed4
Establish CachedUserInfo.OnInventoryReceived event so that region/test inventory code can be written with the async inventory fetch
2009-08-11 16:45:16 +01:00
Arthur Valadares
2054093908
Added some needed comments to SceneSetupHelper (actually just retriggering panda)
2009-08-11 12:24:41 -03:00
Arthur Valadares
18aa2ea0c5
* Improves SceneSetupHelper to allow the tester to choose a real or mock, inventory and asset, service modules. The boolean startServices was replaced with realServices string. If the string contains the word asset, it will start a real asset module, if it contains inventory, it starts a real inventory. Otherwise, it use mock (NullPlugin-like) objects, for tests that don't really need functionality.
...
* SetupScene is now actually sharing the asset and inventory modules if the tester wishes to have multiple regions connected. To link regions, just start SetupScene with the same CommunicationManager for all scenes. SceneSetupHelper will hold a static reference to the modules and won't initialize them again, just run the scenes through the modules AddRegion, RegionLoaded and PostInitialize.
* With the recent changes, both asset and inventory (and in the future, user) services should always be asked from the scene, not instantiated alone. The tests should reflect this new behavior and always start a scene.
2009-08-11 12:07:54 -03:00
Diva Canto
cdcbc48534
Added two new methods to IIventoryService -- GetFolderForType and GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet.
2009-08-10 20:31:51 -07:00
Diva Canto
9f95ec4998
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-10 16:02:33 -07:00
Diva Canto
0c47f8e7ab
Changed RequestRootFolder to GetRootFolder
2009-08-10 16:02:09 -07:00
Melanie
eba23048ca
Replace the Replaceable modules name
2009-08-10 23:08:22 +01:00
Diva Canto
17cc9b9857
Last piece of cleaning up old inventory. Old IInventoryServices and ISecureInventoryService interfaces removed.
2009-08-10 12:44:15 -07:00
Diva Canto
34d0f119cb
Conditional to prevent a null ref in tests. The tests may still not pass.
2009-08-10 11:48:30 -07:00
Diva Canto
43b7e67288
Et voila! - Old inventory code removed.
2009-08-10 10:58:43 -07:00
Diva Canto
5d2a157e64
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
2009-08-10 10:48:21 -07:00
Diva Canto
d12c173a70
AssetCache.addin.xml seems to be historical junk too. Removed.
2009-08-10 09:01:07 -07:00
Justin Clark-Casey (justincc)
da82fe0409
* Fix test failure by setting up MainConsole.Instance in SceneSetupHelpers.SetupScene()
2009-08-10 16:55:53 +01:00
Jeff Ames
3e247a8eaa
Minor: formatting cleanup.
2009-08-11 00:32:59 +09:00
Jeff Ames
8863092f7c
Split BasicPhysics classes into separate files.
2009-08-11 00:32:59 +09:00
Diva Canto
0d8284c7a1
Removed IAssetCache.
...
WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 08:14:57 -07:00
Diva Canto
7e13e96f56
Removed IAssetServer.
2009-08-10 08:01:13 -07:00
Diva Canto
024755d8b7
Slowly working my way towards the elimination of IAssetServer and IAssetCache.
2009-08-10 07:13:13 -07:00
Diva Canto
a50904a68b
More clean up from asset cache legacy. None of these classes are used anymore.
2009-08-10 06:41:03 -07:00
Diva Canto
c7484dc739
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-10 06:35:38 -07:00
Adam Frisby
ad016ba87c
Added some help instructions to the new RegionInfo region setup process; mainly to point out 'yes you can input information here.' since it seems to elude some users.
2009-08-10 19:06:09 +10:00
Diva Canto
3f06fb3601
Removing unused files, legacy from old asset "cache".
2009-08-09 17:46:37 -07:00
Melanie
239a14265e
Stub out the Profile and Presence services
2009-08-10 00:17:54 +01:00
Melanie
430cc0a24a
Add "show digest <id>" console commdn to the ROBUST asset handler
...
R.O.B.U.S.T.# show digest b8d3965a-ad78-bf43-699b-bff8eca6c975
Name: Terrain Dirt
Description:
Type: 0
Content-type: image/jp2
0000: FF-4F-FF-51-00-2F-00-00-00-00-00-80-00-00-00-80
2009-08-09 23:22:59 +01:00
Diva Canto
a5a5e44246
Re-removing 2 lines that got added back on Melanie's commits. git hickup.
2009-08-09 15:17:42 -07:00
Melanie
474f58faf5
Finish the renaming and mae things compile again
2009-08-09 22:25:15 +01:00
Melanie
6ba89bef61
More renames
2009-08-09 22:09:10 +01:00
Melanie
11d72f270d
Rename UserData to UserAccount data
2009-08-09 21:53:11 +01:00
Diva Canto
6a6dd66129
More removal of HG2 code, this time authentication module and handlers.
2009-08-09 14:21:47 -07:00
Diva Canto
04aca66330
Removed HGInventory out of core. This is part of HG2, which it now being developed outside.
2009-08-09 13:59:26 -07:00
Teravus Ovares (Dan Olivares)
8b9f8709aa
* FreeContext may be a bit too buggy for my tastes in some environments. * Commenting it for the moment.
2009-08-08 14:14:52 -04:00
Jeff Ames
bc6ec3b564
Formatting cleanup.
2009-08-09 00:43:13 +09:00
Teravus Ovares (Dan Olivares)
e88903f481
* Fix one physics crash for regions larger then 512mx512m
2009-08-08 10:38:53 -04:00
Teravus Ovares (Dan Olivares)
b5727a1d77
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-08 00:10:38 -04:00
Teravus Ovares (Dan Olivares)
bff26ccdbb
* More tweaking of the various services to work with nonstandard region sizes. * Now, what's available of the terrain will show and it'll be truncated if it's larger on Linden Clients. Parcel minimum is 64 (256/4) for the client to accept it.
2009-08-08 00:10:19 -04:00
Melanie
7fc9358ec3
Patch from otakup0pe:
...
A better solution for making the FreeSwitch module cooperate with
existing installations
2009-08-08 03:29:00 +01:00
Melanie
0b0ed200f6
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-08 01:43:28 +01:00
Melanie
dd03ad86c5
Change the default for internal IP address back to 0.0.0.0
2009-08-08 01:42:50 +01:00
Teravus Ovares (Dan Olivares)
d842c1d459
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-07 20:32:23 -04:00
Teravus Ovares (Dan Olivares)
2b990a61bf
This is the second part of the 'not crash on regionsize changes'. This lets you configure region sizes to be smaller without crashing the region. I remind you that regions are still square, must be a multiple of 4, and the Linden client doesn't like anything other then 256. If you set it bigger or smaller, the terrain doesn't load in the client, the map has issues, and god forbid you connect it to a grid that expects 256m regions.
2009-08-07 20:31:48 -04:00
Melanie
0d2167b6db
Update threat level description
2009-08-08 00:53:34 +01:00
Teravus Ovares (Dan Olivares)
c8a68fb3fb
* Remove hard coded 256 limitations from various places. There's no more 256m limitation within the OpenSimulator framework, however, the LLClient ClientView does not support regions larger then 256 meters so, if you try and make your region larger by setting Constants.RegionSize = 512; in OpenSim.Framework.Constants.cs, the terrain will not display on clients using the LLUDP protocol
2009-08-07 18:40:56 -04:00
Melanie
9337a94f33
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-07 23:06:52 +01:00
Melanie
257ed4c4ac
Remove debugging output frm ini file loading. Make it collect matching
...
files only from last path component.
2009-08-07 23:05:16 +01:00
Melanie
a1a09297bc
Silly error, simple fix
2009-08-07 22:40:58 +01:00
Melanie
e1427b4c3f
Try another way to canonicalize the path that may work in Windoze
2009-08-07 22:37:41 +01:00
Melanie
e97beb07c9
Add extensive debug output to Util.Glob
2009-08-07 21:59:54 +01:00
Melanie
6c6527caae
Thank you, Godfrey, for a patch that implements osGetLinkPrimitiveParams
...
Fixes Mantis #3979
Applied with changes. Changed ThreatLevel to High since all discovery
functions are a high threat. Overriding that is the responsibility
of the grid owner.
2009-08-07 21:51:03 +01:00
Melanie
ad0d2fea20
Experimental! Implement ISponsor in ScriptInstance
2009-08-07 21:30:21 +01:00
Melanie
d10f157183
Remove GetFullPath call from config includes, because it barfs in Windoze
2009-08-07 20:51:07 +01:00
Melanie
4ee8d8a813
Another stab at cmickeyb's patch for script GC.
...
Moved the Close() for the appdomain-hosted parts into a new destructor
on ScriptInstance.
2009-08-07 20:43:23 +01:00
Melanie
2148f84e1e
Temporailiy add some info output in config load
2009-08-07 20:18:04 +01:00
Melanie
178b40971a
Add a method to init the OSSL Api's m_LSL_Api member back to the OSSL Api
2009-08-07 19:50:47 +01:00
Melanie
3219e648cc
From: Snowcrash <Snowcrash.short@gmail.com>
...
Date: Wed, 5 Aug 2009 12:45:56 +0200
Subject: [PATCH] A few minor tweaks to the MRM API's in order to make it possible for MRM's to run in a separate AppDomain without poluting the primary appdomain of OpenSim
Specifically:
Added an explicit method for getting the "globals" of the MRM, removing the need to have the MRM script code loaded into the primary domain, in order to set up proxies
Added a [Serializable] attribute to TouchEventArgs, again in order to remove the need to have MRM script code loaded into the primary domain.
---------
Applied with whitespace changes
2009-08-07 19:04:20 +01:00
Melanie
7811bceb8f
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-07 19:01:27 +01:00
Sean Dague
ca5da5face
Merge branch 'groups-core-contrib' of git://github.com/mcortez/opensim into incoming
2009-08-07 11:07:41 -04:00
Melanie
cb10700a1f
Make the opensim.ini logfile option really work (port of a fix from ROBUST)
2009-08-07 14:15:59 +01:00
Adam Frisby
270ae50d70
* Implements MRM's Stop() interface member.
...
* MRM Scripts should do appropriate cleanup within this event, to allow for clean shutdowns and script updates. This means unbinding from events you are listening to, and releasing any resources.
2009-08-07 14:17:51 +10:00
Melanie
e49abf446a
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-07 03:05:46 +01:00
Melanie
f8d8366bfa
Revert the XEngine memleak patch, it causes premature GC.
...
This matches behavior seen with an earlier attempt to do this, apparently
the sponsor mechanism does't work in Mono
2009-08-07 03:04:06 +01:00
Diva Canto
53ba245967
HGAuthenticationService must be a singleton, because it has in-memory state. This makes this singleton register with IScene, so that other parts can retrieve its reference.
2009-08-06 18:43:53 -07:00
Diva Canto
11c698af67
Added missing trailing slash in AuthenticationService.
2009-08-06 17:42:28 -07:00
Diva Canto
ea940d98f9
Added ToXml2() to ISceneObject, so that components other than regions can use this abstraction.
2009-08-06 16:41:24 -07:00
Melanie
91f6898b26
|From: James J Greensky <jame.j.greensky@intel.com>
...
|Date: Wed, 5 Aug 2009 09:51:52 -0700
|Subject: [PATCH] Closed two major memory leaks for scripted objects
|
|Two major memory leaks for the scripted objects were fixed
|- One leak had to do with remoting acrossing app domains. When a script and
| its controlling agent communicate across an application boundary, it calls
| functions on a stub proxy object that then invokes the remote method on
| the object in the other app domain. These stub objects (two for each script)
| were setup to have infinate lifetimes and were never being garbage collected.
|- The second leak was the result of adding a scene object part instance method
| to a scene event and never removing it. This cause the event's delegate list
| to maintain a link to that object which is then never freed as the scene event
| object is never destroyed.
Patch applied, please direct feedback to me. Possible issue: Longtime idle
scripts like vendors may fail.
2009-08-06 22:03:20 +01:00
Justin Clark-Casey (justincc)
615e1ed285
goose panda
2009-08-06 20:04:40 +01:00
Justin Clark-Casey (justincc)
07e6a492a1
Disable all IAR tests for now due to possible failure-causing race condition
2009-08-06 19:35:52 +01:00
Michael Cortez
72e597bcba
Merge branch 'master' into groups-core-contrib
2009-08-06 11:22:10 -07:00
Sean Dague
4078a331e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2009-08-06 14:03:16 -04:00
Sean Dague
b0e6d0fc01
skip sqlite tests on z linux, as sqlite doesn't work right on the platform
2009-08-06 14:01:36 -04:00
Michael Cortez
2ac04cb624
Merge branch 'master' into groups-core-contrib
2009-08-06 09:38:51 -07:00
Michael Cortez
6244b8c384
Fixing comments re: INI file.
2009-08-06 09:34:30 -07:00
Melanie
efc57bc3d7
Allow arbitrary wildcards in config includes. Things like
...
Include-Modules = "addin-modules/*/config/*.ini" will now work.
Adds Util.Glob, which will resolve a globbed path into a string list.
2009-08-06 02:29:12 +01:00
Melanie
c73ee1d06e
Complete the work on the Replaceable interface logic. From this commit onwards
...
the mere presence of a full version of a replaceable module will cause the
replaceable module in core to be deactivated.
2009-08-06 01:10:45 +01:00
Michael Cortez
c73a6ab7e0
Continue with renaming of Groups module components
2009-08-05 14:56:48 -07:00
Teravus Ovares (Dan Olivares)
72b6e7f949
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-05 17:38:27 -04:00
Teravus Ovares (Dan Olivares)
535cb0efc1
* Patch from jhurliman to add accept type recognition to determine the llsd content format. *should allow both json and xml serializations of llsd to work properly.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-08-05 16:47:48 -04:00
Michael Cortez
6c65b990a2
Fixes mono Add-In references for the OptionalModules add-in so that groups doesn't throw errors, and so that the add-in is correctly reported as "OptionalModules" rather then as "SampleMoney"
2009-08-05 13:20:46 -07:00
Melanie
e8b0f7cf5d
Remove bad assembly identification tag
2009-08-05 20:37:10 +01:00
Justin Clark-Casey (justincc)
bc6de6f5f0
Disable TestReplicateArchivePathToUserInventory() pending more investigation
2009-08-05 20:05:22 +01:00
Justin Clark-Casey (justincc)
1f7466e5c3
test item data storage impementation (unused as of yet)
2009-08-05 20:04:27 +01:00
Justin Clark-Casey (justincc)
07e00e110d
Reinstate TestLoadIarV0_1ExistingUsers(), removing unnecessary wait
2009-08-05 19:38:45 +01:00
Michael Cortez
989517725d
Begin refactoring XmlRpcGroups to a more generic Groups module that allows for replaceable Groups Service Connectors.
2009-08-05 11:15:53 -07:00
Justin Clark-Casey (justincc)
9e5736eeec
insert a little more debug info for TestReplicateArchivePathToUserInventory()
2009-08-05 19:06:07 +01:00
Justin Clark-Casey (justincc)
f8d8f07cb4
Remove waiting in TestReplicateArchivePathToUserInventory() since local inventory loading is synchronous
...
Insert a little more debugging info in case the occasional failure reoccurs
2009-08-05 18:59:44 +01:00
Justin Clark-Casey (justincc)
1b65bd5861
Recomment TestReplicateArchivePathToUserInventory() for now due to occasional test fail
2009-08-05 18:21:22 +01:00
Justin Clark-Casey (justincc)
9e0f1b7fef
reinstate TestSaveIarV0_1()
2009-08-05 18:01:18 +01:00
Justin Clark-Casey
e5904c3883
remove some more mono compiler warnings
2009-08-05 17:39:32 +01:00
Justin Clark-Casey
190bdc8a2e
* Remove some mono compiler warnings
2009-08-05 17:33:23 +01:00
Justin Clark-Casey
3323413f53
reinstate TestReplicateArchivePathToUserInventory()
2009-08-05 17:17:20 +01:00
Justin Clark-Casey
bfc705766b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-04 19:01:01 +01:00
Justin Clark-Casey
7f5a4bbc26
* Small commented out debug message for module loading, partly to test my ability to commit with git
2009-08-04 19:00:20 +01:00
dr scofield (aka dirk husemann)
4ffc284a36
trying to fix rare timer related exception.
2009-08-04 17:24:32 +02:00
Alan Webb
068f54725b
Slight change to state management for attach scheduling.
...
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-08-04 11:44:22 +02:00
Alan Webb
9ffe4d850e
This change adds support for the attach event in scripts.
...
[1] Added a new OnAttach event to Scene/EventManager
[2] Hooked up existing attach event handler in XEngine.
[3] Modified SceneGraph and Scene.Inventory to trigger
attach events at the appropriate places. I was forced
to distribut the changes across two files because of
the way attach processing is distributed across the
two files.
[4] In the case of RezSingleAttachmentFromInventory it is
necessary to handle event scheduling in a special way.
There is no synchronous path available, so the fact
that this object is attached, and who it is attached to,
is cached when the ScriptInstance is created. When
the script is started, the attached handler is driven
after on_rez (but before changed, this should be reviewed).
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-08-04 11:41:06 +02:00
dahlia
21e62e87c7
starting to refactor path generation out of prim extrusion
2009-08-03 22:59:47 -07:00
Melanie
c3dd98b016
Revert the #3899 patch and it's two follow ups
2009-08-04 05:03:32 +01:00
Melanie
1d8df738f6
Update a misspelled name
2009-08-04 04:57:08 +01:00
Melanie
2b8c3f8519
Change the freeswitch out connector (which is pointless) to an in connector
2009-08-04 04:32:44 +01:00
Melanie
afc318f30b
Add the region module shell for the new freeswitch service
2009-08-04 04:25:17 +01:00
Melanie
0f400dc83d
Adding the plumbing for a ROBUST freeswitch service
2009-08-04 04:11:04 +01:00
Melanie
17bdc45c5c
Add plumbing for the SceneObjectDeleter to wait for the script engine to
...
allow final deletion of objects. Meant to support the attach(NULL_KEY) event,
2009-08-04 03:17:13 +01:00
Melanie
1f90d2a2c6
If the FreeSwitch context is unset or "public", then accept any context.
...
This restores the "out of the box" functionality.
2009-08-04 00:43:49 +01:00
Melanie
fa20a2685b
Output the Freeswitch context received and the context set up in the
...
debugging message so a mismatch can be corrected more easily
2009-08-04 00:38:20 +01:00
Charles Krinke
acf7206f4b
Thank you kindly, dslake, for a patch that:
...
The region dearchive module assumes extra null bytes will be appended
to the end of every OAR file. This may be due to the block nature of
storage but it seems like an unsafe assumption. When streaming region
archives over a network or through a memory stream, no additional null
bytes are added to the end and this an exception.
2009-08-02 19:30:25 +00:00
Teravus Ovares
fea3ffa154
* An enum for The VisualParams array that the viewer sends us with 90% of the documentation.
...
* Automatically generated using the BuildVisualParamsEnum Method that gets data from the libOMV VisualParams NameValue definitions which they generate from the the avatar_lad.xml file
* Want to know what element controls the eye size, jowls. pointy ears? no problem.
2009-08-02 06:38:52 +00:00
Teravus Ovares
4cbf0444df
* Tweak the caps manager so that the NPCAvatar works again.
2009-08-01 14:26:00 +00:00
Jeff Ames
4ce5c894cf
Add copyright header. Formatting cleanup.
2009-08-01 05:11:47 +00:00
Melanie Thielker
ff35a3378e
Make ROBUST not hang on exit in recent Mono versions. Make the logfile config
...
setting/commandline option actually work.
2009-07-31 21:00:09 +00:00
Teravus Ovares
ae8d3ab22e
* Fix a locking issue in the EventQueue
2009-07-31 20:53:35 +00:00
Teravus Ovares
23a8895d29
* Fixed another potential httpserver leak.
2009-07-30 18:16:00 +00:00
Melanie Thielker
22a533b675
Thank you, dmiles, for a patch that allows more differentiated script
...
permissions for YP scripts.
2009-07-30 15:38:42 +00:00
Dahlia Trimble
6c94ce1cca
Flag certain meshes to avoid vertex list compaction. This should help speed up meshing time at startup.
2009-07-30 07:06:23 +00:00
Teravus Ovares
a8246bc57e
* Remove and comment out old and unneeded parts of the old TextureDownload and UserTextureDownloadService modules.
...
* These have been mostly replaced by the PriorityQueue sender in LLClientView (it was still using threads and poll processing!)
* Thread Reduction!
* Might have been sending more image packets then necessary previously, texture times 2. We'll see if this reduces the texture packet load.
2009-07-30 06:27:45 +00:00
Melanie Thielker
07579fa402
Add basic support ofr detached request handling to the HTTP server.
...
Groundwork to finish HTTP IN.
2009-07-29 23:13:08 +00:00
Teravus Ovares
83a421a562
* An attempt to fix mantis #3955
...
* It's possible it could re-cause mantis #3953 , but the FreeContext isn't always necessary because Connection: close ---> Disconnect(SocketError.Success) { FreeContext(); }
2009-07-29 21:53:18 +00:00
Teravus Ovares
f727f26bcc
* An attempt to fix mantis #3953
2009-07-29 20:32:54 +00:00
Melanie Thielker
cbeebc209d
Thank you, coyled, for a patch to change Flotsamcache path generation
...
to avoid directory overflow.
2009-07-29 17:21:36 +00:00
Melanie Thielker
cabda86615
Patch from Kai Ludwig: Fix prim drawing on maptile.
2009-07-29 16:32:56 +00:00
Teravus Ovares
50204f6ee2
* Re trigger panda
2009-07-29 02:41:00 +00:00
Teravus Ovares
032aeb8b5d
* Adds the ability to have a thread efficient long poll service (such as the eventqueue)
...
* If this doesn't melt the Http Server, this will significantly reduce the number of threads in use on regions with many users.
* Adds AddPollServiceHTTPHandler, and RemovePollServiceHTTPHandler to BaseHttpServer
* Generic enough to be used for many long poll services, not only the EventQueue.
2009-07-29 02:15:45 +00:00
Melanie Thielker
f94985a939
Add the missing block to the alert message
2009-07-28 20:27:31 +00:00
Melanie Thielker
aa06d9f98b
Add the new StatusData block to the other two searchh packets
2009-07-28 19:28:01 +00:00
Melanie Thielker
64c874a951
Fix a null data block in DirClassifiedReply packet, preventing a session
...
crash in search.
Fixes Mantis #3952
2009-07-28 18:46:45 +00:00
Melanie Thielker
b008865110
Thank you, mcortez, for a patch to correct a folder bloat issue in the
...
Flotsam Asset Cache.
Fixes mantis #3950
2009-07-28 17:20:51 +00:00
Jeff Ames
a1786d4c39
Formatting cleanup.
2009-07-28 09:40:07 +00:00
Melanie Thielker
aec16c2a0a
Than you, otakup0pe, for a patch to correct llSetPos & friends' behavior
...
for child prims.
Fixes Mantis #3931
2009-07-27 23:13:31 +00:00
Melanie Thielker
3038efcc47
Preserve the creator of items copied in inventory.
...
Fixes Mantis #3946
2009-07-27 21:25:33 +00:00
diva
5ca02f0a08
This does NOT address the issue in mantis #3940 , but it may avoid the exception reported there by WiLLuMPJuH Huisman pertaining to TeleportFailedPacket.
2009-07-27 19:20:48 +00:00
Melanie Thielker
06e4297b93
Patch from RemedyTomm: A failed inventory request would block any further
...
requests from that same user, even after a relog.
This patch changes the block on further requests to be in line with the
request timeout timer and allows the system to recover.
2009-07-26 19:09:59 +00:00
Teravus Ovares
687e84048d
* as per my e-mail to opensim-dev archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007223.html
...
I'm bumping gridcomms interface version to 5.
MajorInterfaceVersion = 5
2009-07-25 21:16:48 +00:00
Teravus Ovares
5ae1ad995d
* Fix Groups Module Null Reference when you were not a member of any group.
2009-07-25 17:29:25 +00:00
Melanie Thielker
7317bd7675
Correct an issue in group packet sending that causes a nullref with
...
libomv-0.7.
2009-07-25 16:55:11 +00:00
Teravus Ovares
64bd9a3354
* Updates libOMV to version 0.7.0
...
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
2009-07-25 15:49:10 +00:00
Justin Clarke Casey
98687df56b
* Apply http://opensimulator.org/mantis/view.php?id=3586
...
* Make MSSQL current in NHibernate
* Thanks mpallari
2009-07-24 20:39:46 +00:00
Justin Clarke Casey
a54998e1f9
* minor: spacing adjustment to retrigger panda
2009-07-24 20:27:24 +00:00
Justin Clarke Casey
a7c8948292
* Apply http://opensimulator.org/mantis/view.php?id=3855
...
* Prevent session crashes when something goes wrong with group invite.
* Thanks mcortez.
2009-07-24 20:08:26 +00:00
Justin Clarke Casey
c3bb9ec42c
* Apply asset and inventory name and description bound checks to MySQL
2009-07-24 20:01:17 +00:00
Justin Clarke Casey
f75949692e
* Extend mssql name string size checking to create/update folder
2009-07-24 19:47:15 +00:00
Justin Clarke Casey
92047114ac
* Extend inventory name and description length checks to UpdateItem for mssql
2009-07-24 19:41:53 +00:00
Justin Clarke Casey
de893a4a10
* Correct minor bug where item description bounded string was not actually being used in the previous patches.
2009-07-24 19:35:16 +00:00
Justin Clarke Casey
b67c1f5086
* Apply similar bounds checks on name and description fields on MSSQL UpdateAsset
2009-07-24 19:21:37 +00:00
Justin Clarke Casey
a3f4330c87
* Apply http://opensimulator.org/mantis/view.php?id=3902
...
* Restrict asset and inventory name descriptions so as not to overflow MSSQL field lengths
* Thanks StrawberryFride
2009-07-24 19:10:32 +00:00
lbsa71
169a353cca
* minor ccc
2009-07-24 06:59:27 +00:00
Arthur Valadares
7bf59c551e
* Updates RESTInterregionComms and LocalInterregionComms to the new region module interface. This fixes an issue where region references were being added but weren't being deleted,
...
causing those "unnotified circuit" messages.
* Also fixes tests accordingly
- Fixes Mantis #3452
- Fixes Mantis #3388
- Fixes Mantis #3871
- Related to Mantis #3493
2009-07-23 16:57:41 +00:00
Jeff Ames
a133e83f3a
Formatting cleanup.
2009-07-23 15:32:11 +00:00
Melanie Thielker
4b84bdb77e
Thank you, patnad, for a patch to advance the UrlModule's functionality.
...
Mantis #3712
2009-07-22 22:16:37 +00:00
Teravus Ovares
c42d5feee3
* Fix SStats under the new HttpServer. (.ajax files are apparently reserved)
2009-07-22 15:48:58 +00:00
Teravus Ovares
e2e43f1ab7
* Whoops, forgot the water heightfield.
2009-07-22 04:11:51 +00:00
Teravus Ovares
9f4b8260c2
* Exclude heightfield geom from the raycast test.
...
* Fixes mantis #3922
2009-07-22 04:04:30 +00:00
Melanie Thielker
7c747035ff
Thank you, MarcelEdward, for a patch to add paying group join fees.
...
Applied with changes (original patch would not compile)
Whitespace changes removed
Fixes Mantis #3926
2009-07-21 23:57:56 +00:00
Teravus Ovares
c243ae43f2
* Updated C# WebServer to the latest available source download (r19869) and applied a few mods from the old version (now up on opensim-libs (VS 3.5 project).
...
* Made various changes to BaseHttpServer to accommodate the new interfaces.
* This version has been significantly re-architected and may fail in unusual and insidious ways.
* Please pay attention to any errors you get and post a Mantis if you can reproduce an issue with the HTTPServer. I'm including the pdb and having the http server compiled in debug for a few weeks so that when an error occurs, it'll print the pertenant data.
* Once again, this is the full C# WebServer, not the lite branch that is included in LibOMV (we need SSL!)
2009-07-21 06:47:29 +00:00
Teravus Ovares
156c393a44
* nothing in this commit, re-triggering panda.. which crashed while testing.
2009-07-21 03:28:12 +00:00
Teravus Ovares
5c8fe5c01c
* Fixed a case where a prim was a NullPhysicsActor instead of an OdePrim
...
* Commented logic that wasn't being used.
* This should fix the errors in OdeScene.near
2009-07-21 03:18:19 +00:00
Sean Dague
57c325540c
From: Rick Alther <alther@us.ibm.com>
...
This patch fixes a problem in the RestXmlWriter where an exception may be
thrown when ToString() is called. ToString() is closing the last tag prior
to returning the string object, which it shouldn't do. People should be
closing the XML tags and document properly and not rely on the ToString()
side effect to do it for them. This is most noticeable if you hit
the /regions/ and /regioninfo/ REST calls. If you are running r9579 or
later, these calls will result in an error.
2009-07-20 15:12:50 +00:00
Teravus Ovares
cf712075e5
* Remove a noisy debug console message that was used for testing the camera constraints. Ooops.
2009-07-19 02:41:32 +00:00
Teravus Ovares
08819bcbea
* Created a way that the OpenSimulator scene can ask the physics scene to do a raycast test safely.
...
* Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see.
* Created a way to know if the user's camera is alt + cammed or just following the avatar.
* Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint)
2009-07-19 02:32:02 +00:00
Melanie Thielker
52f983613c
Thank you, otakup0pe, for a patch that enables basic auth with LSL
2009-07-18 20:10:19 +00:00
Teravus Ovares
bb4b81d70f
* patch from jonc
...
* Fixes scaling a group in some situations.
* fixes mantis #3886
* Thanks jonc!
2009-07-17 21:32:35 +00:00
Teravus Ovares
b6caf1606d
* If the world map module encounters an error, not all of the objects will be created and will therefore be null in the finally clause. Therefore, only dispose of objects that are not null in the finally clause.
...
* fixes mantis #3848
2009-07-17 21:13:50 +00:00
Teravus Ovares
eb1a6e9b87
* Patch from otakup0pe to help freeswitch play nice with complex existing freeswitch configurations.
...
* Thanks! fixes mantis #3899
2009-07-17 21:06:28 +00:00
Teravus Ovares
05c24a648d
* Another attempt to remedy the 'ghost prim' situation. This time for attachments on teleport.
2009-07-17 18:38:03 +00:00
Teravus Ovares
ebb03e2aab
* This should fix the phantom prim from attachments rezzing.
...
* fixes mantis #3896
* fixes mantis #3898
2009-07-17 17:53:22 +00:00
MW
acea31518b
fixed the bug where changing the rotation of a selection of prims in a linkset, made each of those prims rotate around its own centre rather than around the geometric centre of the selection like they should do (and like the client expects).
...
This involved adding a new OnUpdatePrimSingleRotationPosition event to IClientAPI so that we can get the changed position from the client.
Btw adding new events to IClientAPI is really tedious where you have to copy the change across to at least 5 or 6 other files.
[Note this doesn't fix the bug where any rotation changes to the root prim (but not the whole linkset) cause rotation errors on the child prims.]
2009-07-17 14:58:54 +00:00
Teravus Ovares
f74622c65f
* Change the order of Update so Physics processes a frame before the scene manipulates the physics Scene.cs
...
* Remove the draconic locking around adding an avatar to the Scene
* Handle an extreme error case when border crossing fails and user uses map to teleport to a different region on the same instance causing control commands to go to a child agent.
* Make the Set Appearance method use the proper 'remove from physics scene' method.
* It *may* help border crossings.
* It *may* help the 'on avatar rez' lag, that people have been seeing the past week.
* It may also cause physics to crash more often on failed teleports (though.. I think I got the cases covered).
2009-07-17 07:28:09 +00:00
Melanie Thielker
01446074b1
Revert the nonessential part of r10033 to restore sanity to trampolines
2009-07-16 19:09:03 +00:00
Melanie Thielker
b79e23dc5c
Allow OpenSim to run without script engines enabled
...
Fixes Mantis #3893
2009-07-16 08:45:52 +00:00
Teravus Ovares
8e1ab33ed3
* Tweaking collision reporting a little more in ScenePresence to not check if the collisions will affect health if the avatar is invulnerable. (saves 3 loops)
2009-07-16 04:50:49 +00:00
MW
5f68b5b82e
There was possible a locking issue in revision 9951 so reverting that revision until further testing can be done.
2009-07-16 00:05:07 +00:00
Justin Clarke Casey
5815162d7e
minor: remove some mono compiler warnings
2009-07-15 20:49:58 +00:00
Justin Clarke Casey
d89cf47d50
* Change server prompt from B.U.S.T to R.O.B.U.S.T, as per mailing list
2009-07-15 20:32:35 +00:00
MW
a266e6dc4b
Bounding Box/find rez from inventory point code now seems to be working correctly.
...
So next step is to clean up that code and wait for bug reports.
2009-07-15 19:46:32 +00:00
MW
856d5f4375
Yet more work on fixing the boundingbox code.
2009-07-15 18:55:28 +00:00
MW
3a72531e4c
More fixing of the boundingbox code.
...
Still more work needed to get linksets to rezz correctly (not in the ground)
2009-07-15 10:42:27 +00:00
MW
08d4fffdfd
A attemp to fix the boundingBox code that I committed the other day.
2009-07-15 10:26:12 +00:00
MW
75bfbc14fc
Test commit to see if commit is working for me, as another core developer is reporting problems.
2009-07-15 10:11:00 +00:00
nlin
56d295cfb5
Fix for avatar falling through terrain when av_capsule_tilted=false, Mantis #2905
...
This fix re-introduces a small tilt into the capsule to prevent
avatar falling through terrain. Re-introduction of the tilt means
that some direction-dependent behavior when walking over prims, but
I have tried to minimize this.
Additionally this commit allows the capsule to wobble slightly when
being pushed around the terrain. This should make walking over prims
easier, as the capsule can wobble and glide diagonally over the prim's
edge, instead of rigidly being stopped vertically against the prim's
face.
2009-07-15 10:09:37 +00:00
Jeff Ames
6b3fc3ccb8
Bump version in Framework/Servers/VersionInfo to 0.6.6.
2009-07-15 05:24:06 +00:00
Melanie Thielker
fb4067c844
A stab at implementing llSetDamage. Not persistent.
2009-07-15 00:10:01 +00:00
Melanie Thielker
750f75c514
Thank you, Twitch, for a patch to restore mayhem and murder to OpenSim
...
Fixes Mantis #3888
2009-07-14 23:20:59 +00:00
Melanie Thielker
e53596f607
Remove redundant distance limitaion in llRezAtRoot
...
Fixes Mantis #3887
2009-07-14 22:10:46 +00:00
Dahlia Trimble
73251ed346
add a constructor overload and an AddPos method to SculptMesh
2009-07-14 06:09:18 +00:00
MW
58b05e5cbe
A commit to retrigger panda
2009-07-13 15:14:44 +00:00
MW
c4318136ba
Changed it so that when rezzing prims from inventory, a bounding box containing all the prims in the group is used for working out the rezzing point. So that none of the child prims are underground. Or at least thats what it is meant to do, still needs more testing and there are still some issues with link sets getting rezzed too high above the ground/target prim.
2009-07-13 14:42:46 +00:00
MW
a7043ebf53
Attempt to make it so items rezzed from inventory aren't half in the ground or half in the prim they are being rezzed on top off. This is currently only correct for single prims (not link groups) and unrotated prims. Next step is to fix for link sets and rotated prims.
...
This needs a lot more testing to find use cases where it might be wrong (like half way up a hill?)
2009-07-13 12:08:14 +00:00
MW
e5e6f4c6df
Fixed bug in AvatarCreationModule, where during the cloning of a folder it would report it was unsuccessful if the folder was empty.
2009-07-12 21:02:57 +00:00
Charles Krinke
82dd4cf3c4
Thank you kindly, Fly-Man for a patch that solves:
...
[RADMIN] Exception whilst loading default avatars ;
Object reference not set to an instance of an object.
2009-07-12 17:00:58 +00:00
MW
d9a8ecf238
Changed the DeRezObject event so it passes a list<uint> of localIDs in one event trigger rather than triggering the event once for every localid in the derez packet.
2009-07-12 12:32:39 +00:00
Adam Frisby
71ab7a1e2d
* Workaround for a bug in Vivox Server r2978, whereby channel-search.channels.count returns 0 instead of the actual channel count. Should not affect more recent versions of Vivox where this issue has been fixed.
2009-07-12 02:16:49 +00:00
Adam Frisby
50ccf914ca
* More Vivox Fiddling
2009-07-12 01:56:38 +00:00
Adam Frisby
a8b40d47d6
* Patch for previous revision.
2009-07-12 01:31:33 +00:00
Adam Frisby
c20a4032e2
* More VivoxModule debugging.
2009-07-12 01:23:49 +00:00
Adam Frisby
199984cbea
* Added some noisy debug information to VivoxModule to try debug why GetChannel fails on LBSA/Zaius Plaza.
2009-07-12 01:04:32 +00:00
Jeff Ames
cce451d9de
Formatting cleanup.
2009-07-11 11:47:33 +00:00
Dr Scofield
ab03772d94
fixing addin.xml
2009-07-11 08:17:09 +00:00
Dr Scofield
d123c74e37
fixing missing ReplacableInterface
2009-07-11 08:16:59 +00:00
Dr Scofield
7a4abf0def
From: Dr Scofield <hud@zurich.ibm.com> & Alan Webb <alan_webb@us.ibm.com>
...
this commit finally adds the VivoxVoiceModule: it supports positional
as well as conference call type voice (currently only per region
server), region and parcel voice, speaker indication (LL client
family), direct avtar-to-avatar voice chat. NOTE: you need to obtain
an customer admin account from Vivox to be able to use this module ---
DON'T ask me about how to about an admin account, i've NO clue, we
just wrote this code.
2009-07-11 08:16:47 +00:00
Dr Scofield
16b4e38f68
fixing warning re ReplacableInterface()
2009-07-11 08:10:54 +00:00
Dahlia Trimble
3f2ee8915d
Some improvements to prim face numbering - only affects viewers using PrimMesher
2009-07-11 04:53:41 +00:00
Teravus Ovares
d54aac41d2
* Added a user friendly message to the sqlite regionsettings saver giving them troubleshooting options and telling them to restart the simulator. This situation, hopefully is temporary and generates an exception when sqlite users first start OpenSimulator because of an unexpected condition in the database layer. Restart and all is well.
...
* Added a user friendly message to the 'No IInventoryService available' condition with troubleshooting options.
2009-07-10 21:47:54 +00:00
Melanie Thielker
ec1a5d8933
Some module reshuffling, no user functionality yet
2009-07-10 20:46:16 +00:00
Melanie Thielker
8ecfc9a717
Committing the interface change and the addition to the modules to get
...
the ball rolling on replacable modules. No user functionality yet
2009-07-10 20:17:13 +00:00
Justin Clarke Casey
18ffbf6342
* minor format changes and message additions
2009-07-10 19:18:05 +00:00
Justin Clarke Casey
d7d2de3a08
* minor: standardize some logging messages
2009-07-10 18:57:16 +00:00
Justin Clarke Casey
148e2d55fa
* minor: Make GridCommon.ini.example refer to inventory service rather than asset where appropriate
...
* Send debug level notice to console if a user fails authentication
2009-07-10 18:40:37 +00:00
MW
78d7f4696e
Now we are past revision 10000, I think its time to start to fix that massive bug that was introduced in revision 1. So here is the first part of that fix.
2009-07-10 11:03:38 +00:00
Jeff Ames
f9ff986908
Switch runprebuild.bat from VS2005 to VS2008. Remove runprebuild2008.bat.
2009-07-10 04:29:00 +00:00
Melanie Thielker
8c8edb0c4e
Explicitly set up the http server singleton fo the tests
2009-07-10 03:54:22 +00:00
Melanie Thielker
c87b75e425
This extra assignment to the singleton should not be needed but may help make
...
the tests pass
2009-07-10 03:38:14 +00:00
Melanie Thielker
b202ab02d0
Adding the new grid services skeleton. Still very much based on the old
...
one but alowing multi-tenancy.
2009-07-10 03:28:10 +00:00
Melanie Thielker
c310fb11f4
Remove all references to HttpServer from CommsManager (all incarnations)
...
Change all uses of the HttpServer properties to use the new singleton
2009-07-10 02:22:26 +00:00
Melanie Thielker
7b457805a3
Create a MainServer static class to access the regions server's HTTP server
2009-07-10 00:59:43 +00:00
Teravus Ovares
e15ffe31e3
* Commit some BinBVH rotation convenience. Calculates the W element of the joint rotation quaternion and provides a property so consumer doesn't have to.
2009-07-10 00:13:42 +00:00
Charles Krinke
dc0a19f737
Thank you kindly, Godfrey, for a patch that:
...
The vector parameter to llSetPos() specifies an absolute position for
an unlinked prim or the root prim of a linkset; however, when the
function is used by a child prim, the vector specifies a relative
offset from the root prim. The changed introduced in llSetPos() treats
this value as an absolute position in all cases, which has the unintended
effect of mangling the position of child prims.
2009-07-09 16:53:55 +00:00
Melanie Thielker
744196d9ba
Thank you, StrawberryFride, for a patch to fix MSSQL parameter naming.
2009-07-09 15:14:43 +00:00
Charles Krinke
61008c9c13
Thank you kindly, SnowDrop, for a patch that:
...
This add a configuration option to the MRM module called "hidden".
if MRM is marked as enabled, the module will additionally check for
the "Hidden" flag, before registering for client side scriping events.
When MRM is running hidden, it will not respond to client side
scripting events, giving serverside scripting modules, like MRMLoader
and MRMAddin the ability to leverage the MRM engine. This way, even
a possible clientside exploit will not be possible, while still
allowing the MRM engine to run.
2009-07-08 20:57:26 +00:00
Charles Krinke
525ab2c278
Thank you kindly, RandomHuman for a patch that:
...
The admin_close_region method removes a region from the simulator without deleting it.
The region can then be recreated by calling admin_create_region with the same UUID.
There is also a change to admin_create_region to facilitate this.The reason I want
to have this functionality is to make it possible to detach regions when they are
idle and recreate them on demand through a web interface. It's probably doable
using the existing methods by saving and loading oars, but it also doesn't seem
like that should be necessary.
2009-07-08 20:53:22 +00:00
Melanie Thielker
2d949c1f25
Add DisableUndergroundMovement to scrpting API to allow underground movement
...
if needed. Defaults to true, so those who want to continue using underground
scripted prims need to add that option and set it.
2009-07-08 14:36:00 +00:00
Melanie Thielker
f4498983aa
Prevent scripts from moving prims underground
2009-07-08 10:22:51 +00:00