42122388ef
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 20:35:05 -08:00
3ef513e863
Presence remote connector and handler. Presence HG Broker. Nothing tested, just compiles.
2009-12-27 20:34:42 -08:00
3a953dfc98
This is somewhat major-like..... Change the intialization order of
...
Application plugins so that MainServer.Instance gets assigned before
RegionModulesController loads the new style shared modules. This
is needed because otherwise no new style shared module could
register a HTTP method.... if it breaks, you get to keep both pieces
2009-12-28 01:56:30 +00:00
eebddcd5e6
Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells.
2009-12-28 01:24:15 +00:00
b8dfccb227
Changed GetAgents to take string[] instead of UUID[]
2009-12-27 16:07:16 -08:00
ad8ee18090
First pass at the local connector for presence. No cache yet. Just the connector to the local service and a presence detector object.
2009-12-27 08:38:05 -08:00
8d36d7beed
Enable the profile module to be replaced completely, even for the base
...
profile data
2009-12-25 23:10:07 +00:00
2c3d7972b9
No-op in this commit. Just increasing the tag number due to weirdnesses.
2009-12-23 19:43:50 -08:00
1fa938aab0
Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones.
2009-12-23 17:31:30 -08:00
f2d2073f2b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-23 21:21:22 +00:00
c05a35cc71
Fix a bounds exception I came across in IAR restore
2009-12-23 21:20:48 +00:00
f45a69821b
Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the stream can be closed.
2009-12-22 21:00:46 -08:00
68187f7245
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
2009-12-21 07:44:17 -08:00
26e3a8ee4b
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
...
* Removed unnecessary debug messages.
2009-12-19 10:16:07 -08:00
9e54e61a43
Make the HG map search recognize host names without ports.
2009-12-14 08:27:16 -08:00
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
dd5696e8bd
Same for the remote auth connector
2009-12-07 14:31:55 +00:00
4c61fcfc40
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
c0f3a4c833
Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin
...
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
2009-12-04 18:26:58 +00:00
30fe88b808
* Terrain uploads via the Estate Tools now support a multitude of file formats. Specifically: . bmp, .raw, .r32 & .r64. (in ascending order of precision)
...
* It uses file length as the detection routine (as each of these formats has a distinct size in bytes for a 256x256 array.) - more formats should be possible to add.
2009-12-03 02:44:12 +11:00
e078fb2e71
Implement god mode user freezing and unfreezing
...
See http://opensimulator.org/mantis/view.php?id=4356
Thanks Revolution
I performed a subsequent probable bug fix in this patch
2009-11-27 19:23:51 +00:00
2e47e51475
Make locking of timers and listeners in script related functions consistent
...
See http://opensimulator.org/mantis/view.php?id=4316
Thanks KittyLiu!
2009-11-27 19:01:45 +00:00
25e2b16451
Apply patch to stop failure of llParcelMediaCommandList() on group deeded land
...
See http://opensimulator.org/mantis/view.php?id=3999
2009-11-27 17:52:23 +00:00
32ef1b9e23
remove stringent content type checking to make it easier to load oars directly from urls
2009-11-27 15:10:12 +00:00
41226dc991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-26 17:05:48 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
2bc19a1e23
Resolve issue where an iar load fails to preserve original item creators
...
See http://opensimulator.org/mantis/view.php?id=4394
This change preserves the uuid when a profile is found rather than the ospa
2009-11-26 16:39:30 +00:00
59caa68e08
minor: add doc to a few parcel methods
2009-11-25 17:49:38 +00:00
40464f6cc6
Change chat config code so that enabled = false actually does disable the chat module
2009-11-25 16:23:37 +00:00
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
c18422ad3a
Implement oar merging
...
An oar can now be merged with existing region contents by using the --merge option
For example, load oar --merge my.oar
Existing terrain, region settings and parcel data is left in place when an oar is merged.
See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information
2009-11-25 16:02:47 +00:00
f9807884a4
Add MIT/X11 licensed NDesk.Options ( http://www.ndesk.org/Options ) DLL to aid command line parsing
2009-11-25 15:28:43 +00:00
f605d59136
Make load/save iar slightly better in the face of io failures by always attempting to close the streams
2009-11-24 18:27:31 +00:00
c083ab6824
make save and load oar slightly more robust by always closing the archive streams even if there has been an error
2009-11-24 17:47:09 +00:00
88ead9ee63
pass all command parameters to load/save oar, not just the filename
...
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
52952a75ca
minor: remove experimental tags from load iar and save iar commands
2009-11-24 15:20:02 +00:00
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
2606bf4a53
minor: very minor formatting change
2009-11-16 19:16:24 +00:00
96be5e5a88
minor: A further minor tweak to reduce iar load logging verbosity
2009-11-13 20:24:45 +00:00
ed1089d892
refactor some test asset creation into a helper class
...
remove mono compiler warning
2009-11-12 19:08:00 +00:00
d21fc1cefb
minor: for now stop iar tests spewing log messages when running testsuite
2009-11-12 18:33:40 +00:00
cedd827f7f
* Added some new syntax options for the Monitor Module's HTTP poll.
2009-11-12 11:17:04 +11:00
2e514bfb1b
* Move RegionCombinerModule to it's own project
...
* Moves the mono_metadata_token_from_dor message to a different module on loading.
2009-11-10 22:40:08 -05:00
05f7fa1543
Broke the monster RegionLoaded method in RegionCombinerModule into 4 smaller methods. Let's see if this avoids a mono bug that is making megaregions not work in mono. Long shot, but worth a try.
2009-11-10 10:39:16 -08:00
90b15aa440
* Added HTTP polling for Statistics Monitor Module (access via http://sim.com:httpport/monitorstats/regionUUID/ )
...
* Returns simple formatted XML document containing statistical data on the current sim.
* Example:
<data>
<AgentCountMonitor>5.0000</AgentCountMonitor>
...
</data>
2009-11-11 00:22:06 +11:00
167c15db9d
Fixed XMLRPC return params
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-11-10 04:14:41 +00:00
7f5d0a6735
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-09 17:36:28 +00:00
716f70cd31
refactor out iar escaping
2009-11-09 17:34:07 +00:00
1ded7edde2
minor: correct slightly over-enthusiastic load iar logging message
2009-11-09 17:24:06 +00:00
7c5dc94cc8
fix load iar regression accidentally introduced in last commit
2009-11-09 17:22:18 +00:00
3c1f50127c
minor: tweak load iar messages to be slightly less verbose
2009-11-09 17:20:30 +00:00
fbcf6ffc18
minor: provide updates on number of assets loaded while executing "load iar"
2009-11-09 17:17:25 +00:00
ae92bbcb95
refactor: break actual item load in iar into separate method
2009-11-09 17:04:05 +00:00
a0c1836fde
minor: remove some old commented out load iar code
2009-11-09 16:43:35 +00:00
678a74e4f7
Tell the user when a 'save iar' has failed because the inventory path could not be found
2009-11-09 16:42:17 +00:00
a3105a34ca
Implement human / escaping for inventory folders as well as items
2009-11-09 16:12:13 +00:00
6820cc93ec
refactor path delimiter in iar utils
2009-11-09 16:08:17 +00:00
a7af92d5d0
minor: remove some mono compiler warnings
2009-11-09 16:03:15 +00:00
9b2592a960
refactor: make human iar escape char a constant rather than a magic char
2009-11-09 15:54:43 +00:00
668850b974
* for iars, allow item names/folders including "/" to be escaped using "\/"
...
* also, "\" has to be escaped as "\\"
* add item name unit test for escaped characters
2009-11-09 15:49:09 +00:00
81c439bcaa
Patch from Snoopy2. Fixes Mantis #4342
...
fixes problems when group owned land was abandoned by the land owner or reclaimed by the estate manager or by god.
Beside that this new patch makes it possible, that users can buy land directly for a group, if the buyer has the required permissions.
2009-11-08 20:36:00 +00:00
1cddc85078
Fixing the build break
2009-11-06 00:06:49 -08:00
dfe4dc735a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-11-05 23:50:42 -08:00
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
f8f1e94cf8
add unit test for iar & escaping
2009-11-05 19:32:24 +00:00
6f4a588397
minor test var name tweak
2009-11-05 19:09:32 +00:00
bae03dfcbd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-05 18:53:57 +00:00
345ddcd0d8
* Escape / character when saving items and folders in an iar so that the loader doesn't barf
2009-11-05 18:53:25 +00:00
ec0d5b408a
Change the permissions module to use the friend list cache already in the
...
friends module instead of requesting the entire friends list over the
network each time a prim is touched.
2009-11-05 17:29:52 +00:00
b098572525
Remove a spammy debug message from friends list check in the perms module.
...
Replace the integer compares with proper bitflags checking from libOMV.
Friends rights are now functional.
2009-11-05 16:46:39 +00:00
83b4b4440b
Patch by revolution, thank you. Mantis #1789 . Implement friends permissions.
...
Applied with major changes. Core functionality commented pending review
for possible rights escalation. No user functionality yet.
2009-11-05 02:09:07 +00:00
9e6f01321e
Fixed a couple of NREs in corner cases.
2009-11-03 10:24:02 -08:00
3c0881c83c
* Committing missing file from last commit.
2009-11-02 00:20:41 +11:00
838bc80ab9
* Implemented some tweaks to monitoring module.
...
* Output is prettier & more useful.
* Added 'Alerts' to allow rules to be constructed using Monitors to detect for events such as deadlocks. This will be translated to SNMP Traps when I get SNMP implemented.
2009-11-02 00:05:49 +11:00
711dde34e4
* Implements new 'Monitoring' system for reporting performance.
...
* Mostly the same set as the StatsMonitor used for Viewer notification, but exposes some new frametimes - including EventMS, PhysicsUpdateMS, LandUpdateMS; new memory monitoring - both GC.TotalMemory and Process.PrivateWorkingMemory64; also exposes ThreadCount (using System.Diagnostics.Process)
* Type 'monitor report' on the console to see output.
* SNMP Implementation forthcoming.
2009-11-01 19:37:40 +11:00
7132877075
* Log progress messages when loading OAR files with a lot of assets
...
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
2009-10-29 01:46:58 -07:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
6a6a8df1ba
Make map search work also for hyperlinked regions.
2009-10-27 20:32:48 -07:00
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
1209db6dcd
Thank you, RemedyTomm, for an update to your previous patch. Garbage-collect
...
the transfers that never happen.
2009-10-26 15:51:28 +00:00
7df54d4ad2
Thank you, RemedyTomm, for a patch to handle Xfer requests being dropped
...
before the file data to be transfered is ready.
2009-10-26 04:52:11 +00:00
2c34619aea
* Changed various modules to not initialize timers unless the module is initialized. Ideally, the timers would not initialize unless the module was actually enabled, but Melanie's work on configuring module loading from a config file should make that unnecessary
...
* Wrapped the Bitmap class used to generate the world map tile in a using statement to dispose of it after the JPEG2000 data is created
2009-10-23 14:22:21 -07:00
588361e2a2
Experimental change to use an immutable array for iterating ScenePresences, avoiding locking and copying the list each time it is accessed
2009-10-23 01:02:36 -07:00
ba2972eaf6
* Send out m_bodyRot everywhere instead of m_rotation. Still have no clue which is right
...
* Fix WorldMapModule.process() to not trip the watchdog timer
2009-10-22 14:33:54 -07:00
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
5d07e18980
A synchronous call to the messaging server was blocking the process of promoting an agent to a root agent (logins and teleports). Changed to an async method
2009-10-22 02:27:06 -07:00
32ccd5bb40
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget()
...
* Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-21 23:03:18 -07:00
edd393ff30
Reverting the deletion of files related to texture sending until we figure out exactly what is and isn't needed
2009-10-20 11:58:23 -07:00
9a5e7222ce
* Removing cruft left over from the conversion to the new texture sending and UDP code
...
* Changing the cache modules to only initialize the caches if they are actually enabled. Should save a bit of resources from unused cache systems
2009-10-20 10:33:23 -07:00
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
bd03cbd815
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:19:37 -07:00
142008121e
* Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This avoids .NET remoting and a managed->unmanaged->managed jump. Overall, a night and day performance difference
...
* Initialize the LLClientView prim full update queue to the number of prims in the scene for a big performance boost
* Reordered some comparisons on hot code paths for a minor speed boost
* Removed an unnecessary call to the expensive DateTime.Now function (if you *have* to get the current time as opposed to Environment.TickCount, always use DateTime.UtcNow)
* Don't fire the queue empty callback for the Resend category
* Run the outgoing packet handler thread loop for each client synchronously. It seems like more time was being spent doing the execution asynchronously, and it made deadlocks very difficult to track down
* Rewrote some expensive math in LandObject.cs
* Optimized EntityManager to only lock on operations that need locking, and use TryGetValue() where possible
* Only update the attachment database when an object is attached or detached
* Other small misc. performance improvements
2009-10-19 15:19:09 -07:00
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
7d6d94a7b5
More debugging of RegionCombinerModule.RegionLoaded() by making RegionLoaded() a two line function
2009-10-16 16:49:13 -07:00
d44b50ee46
* Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time
...
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
2009-10-15 15:25:02 -07:00
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
d83ace0d3b
Merge branch 'master' into htb-throttle
2009-10-14 05:10:43 +01:00
31a61bbeec
* Fixes some prim crossings on megaregions with regions beyond the 512m mark
...
* There's a slight chance that this could cause a problem with regular prim crossings.. but hopefully not. Revert if it does.
2009-10-13 22:03:53 -04:00
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
c0beeb929e
* Fixes http://opensimulator.org/mantis/view.php?id=4225
...
* Fixes http://opensimulator.org/mantis/view.php?id=3959
* Allows for viewing inventory textures outside home grid
2009-10-12 17:00:01 -07:00
bf68dad643
0004246: [Patch] FlotsamAssetCache deep scan & cache
...
Thank you, mcortez.
2009-10-12 23:21:32 +01:00
5e6e31591c
Merge branch 'master' into htb-throttle
...
This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.
2009-10-10 10:26:47 +01:00
ef03b2d936
Fix selling objects
2009-10-10 10:18:16 +01:00
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
9618c196c2
Revert "Merging in diva's locking fixes"
...
This reverts commit 832cc68513
2009-10-07 01:44:36 +01:00
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
e992ca0255
Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed.
2009-10-06 15:39:53 -07:00
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
77b4abaa25
* Removed verbose debug message
...
* Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers
* Fixed a stupid bug in the InventoryConnector which was making move items do things twice
2009-10-06 11:08:11 -07:00
3db4d38645
Removing dependencies on System.Runtime.Remoting.
2009-10-06 09:54:15 -07:00
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
2a19187e01
* minor: tweak asset cache logging levels downwards
2009-10-05 18:32:19 +01:00
ad81b453b3
GetRegionByPosition: use the cache, Luke.
2009-10-05 09:02:52 -07:00
362e94a022
* KeepAlive set to false in expect_user and log_off.
...
* Check for null SP in PermissionsModule.
2009-10-04 16:30:12 -07:00
fe9cca64de
Stream needs to be closed before the file can be moved...
2009-10-04 09:56:54 -07:00
b803d5ab9b
Make sure to close the file streams on the FlotsamCache, even if something fails.
2009-10-04 09:44:04 -07:00
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
874e423141
Fix my build break
2009-10-03 15:37:31 +01:00
b4d1cf0009
Small permissions tweak
2009-10-03 14:22:29 +01:00
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
a030e3d61b
* Attempting to fix a issue with console commands & the estate module. Again.
2009-10-02 10:53:21 +10:00
6e0c79b8fe
* Rewrote LLImageManager to use a real priority queue and hold minimal state
...
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
2009-10-01 17:42:13 -07:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
f56dc5fcda
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
...
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
2009-09-30 19:26:53 +01:00
f908e32f62
Revert "Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug"
...
This reverts commit 22cc31135e
2009-09-30 19:26:26 +01:00
22cc31135e
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug
...
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
2009-09-30 18:42:45 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
bc892c1d4c
A little hack to see if this fixes the problems with ~20% of SOG's becoming phantom after an import to megaregions.
2009-09-29 07:54:56 -07:00
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
4eca59ec13
Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache.
...
Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
2009-09-28 17:33:34 -07:00
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
e15a9b8484
Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing the notifications of the messaging service in standalone.
2009-09-27 17:01:30 -07:00
689eea3bad
Guarding the methods under if (m_Enabled)
2009-09-27 15:06:44 -07:00
2432cc607e
Neighbours cache working.
2009-09-27 13:43:57 -07:00
5d09c53a1a
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
2009-09-27 10:14:10 -07:00
f4bf581b96
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
...
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
dcfd08b8dd
Fixed a bug with link-region.
2009-09-26 11:01:18 -07:00
b5163889b9
Fixed the order of params to GetRegionRange.
2009-09-26 10:30:45 -07:00
632bb71262
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
...
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
d39e67d5b2
More redirects to HGGridConnector-as-HyperlinkService.
2009-09-26 08:06:14 -07:00
7253a9453e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-26 07:49:04 -07:00
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
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
0bdf75637f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-25 19:19:01 +01:00
eed8a61559
More small changes to FlotsamAssetCache as per mcortez' request.
2009-09-25 08:47:45 -07:00
902279f0fd
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 08:39:09 -07:00
9249c026f2
Don't preserve full user profile details within iars for now
...
This information was not being used in the load process
2009-09-25 16:22:43 +01:00
613cb417c0
add control files containing version info to iars
2009-09-25 14:52:53 +01:00
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
f62b5e6cec
Produce a different error message if the user service does not have the authenticate method available
2009-09-24 15:19:47 +01:00
7870152d23
Allow load/save iar password checks to be done in grid mode
...
This should allow load/save iar to work for grid mode as long as the grid user service is later than this revision
Grid services of earlier revisions will always erroneously report incorrect password. This will be addressed shortly.
2009-09-24 14:54:12 +01:00
ca69fac13e
* Send Updated Information Packet to Clients after updating estate settings.
2009-09-24 22:02:29 +10:00
8605c5d2eb
* Establishing why new console commands fail to work. >_>
2009-09-24 21:46:41 +10:00
57429423bb
* Fixing typo.
2009-09-24 21:29:57 +10:00
aca9fd182e
* Added two new commands to EstateManagementModule
...
* Also, I hate git.
2009-09-24 20:27:11 +10:00
1260c81a9c
More tests. Seems to be working.
...
Grid connector modules are enabled for standalones only, but nothing in the simulator uses them yet, so it's safe to go in.
2009-09-23 20:51:04 -07:00
fd8fb7735b
First test passes -- regions being registered and retrieved correctly in Data.Null.
2009-09-23 20:39:25 -07:00
3c19bd5142
Unit tests for the grid service. Yey!
2009-09-23 20:35:16 -07:00
67276589c8
Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
...
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
35deff7ec4
Modules active. Tested HGGridConnector in standalone only for now. Modules commands work.
2009-09-23 09:27:01 -07:00
882d2c9cc3
Added hg console commands to the module.
...
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
0fc2b73e7b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-22 14:15:53 -07:00
34f4738159
Added HGGridConnector and related code.
2009-09-22 11:58:40 -07:00
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
a9ced0fe79
Added Remote grid connector module.
2009-09-21 19:33:56 -07:00
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
5511c62580
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-21 18:12:12 +01:00
6d0e7b6a6c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-21 11:05:20 -07:00
390137d540
Added grid handler and grid remote connector.
2009-09-21 11:05:01 -07:00
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
66f8166bd0
First pass at LocalGridServiceConnector. Nothing of this is used by the simulator yet.
2009-09-18 20:01:33 -07:00
967cbde055
correct off-by-one error in save iar command handling
2009-09-18 22:25:32 +01:00
33ea86374a
provide intelligble warning of why load/save iar doesn't work on grid mode, pending a fix
2009-09-18 22:22:00 +01:00
a4c093469a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-16 18:21:46 +01:00
35260faead
on iar save/load, let the user know if they put in the wrong password
...
refactor GetUserInfo() to eliminate copypasta
2009-09-16 18:20:55 +01:00
281ad1251c
updated the IAuthorizationService interface so that a message is passed back and can be displayed at the client when an avatar is denied access to a region
2009-09-16 10:04:07 -07:00
3403ae81e8
Stop a loaded OAR from generating on_rez events. This brings
...
the OAR loader in line with region restart (and the correct
behavior).
2009-09-16 16:29:52 +02:00
c5455d4fe7
And another go
2009-09-15 08:24:51 +01:00
cec296543c
Attempt to fix the tests
2009-09-15 08:12:53 +01:00
7c925744f6
Some OSGrid specific changes, please use this or later for OSGrid use
2009-09-15 07:55:29 +01:00
a964bc3ca4
Apply http://opensimulator.org/mantis/view.php?id=4142
...
Re-enable XMLRPC scripting calls
Moves XMLRPC scripting setup to a separate section
Thanks Fly-Man-
2009-09-14 18:31:34 +01:00
5a64ca4642
label load and save iar commands as experimental.
2009-09-14 16:57:47 +01:00
dd4d70eafe
re-enable load and save iar commands
2009-09-14 16:54:36 +01:00
feccfe4096
* Add the RegionCombinerModule back
...
* Yay anonymous delegate in an anonymous delegate.
2009-09-13 19:09:48 -04:00
3a9e1cf0a3
Temporarily removing the RegionCombinerModule to debug a mono assert on linux
2009-09-13 18:43:20 -04:00
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
fe4f312d55
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 07:28:08 -04:00
4241cdc929
* More comments in the RegionCombinerModule
...
* Changed the Destination ID to 0 in the TeleportFinish Event (why did we have it as 3?)
* Added border based trigger teleports
* Fix MakeRootAgent border cross tests for ensuring that the position is inside the region to use the borders to figure out if it's outside the Region
2009-09-13 07:20:18 -04:00
01ec93945e
Formatting cleanup.
2009-09-13 13:56:09 +09:00
c573a32529
Disable non-user ready load/save iar for now pending possible format change
2009-09-11 20:38:08 +01:00
f20a052ef5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-11 18:20:41 +01:00
212efc0c76
Remove bug where iar created folders could not be deleted after relog
...
New folders need to be created with AssetType.Unknown rather than AssetType.Folder!
2009-09-11 16:51:57 +01:00
ca0810a103
Minor indentation cleanup.
2009-09-11 06:59:10 -07:00
eaec7cf39c
Changed RemoteAuthorizationServiceConnector so that it implements the IAuthorization interface method isAuthorizedForRegion looks up user and region data and delegates the remote authorization check to the AuthorizationServiceConnector
...
This keeps the IAuthorization as clean as possible and moves the dependency of using a UserProfileData object out to the connector from the scene.
2009-09-11 06:50:24 -07:00
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
953ef780c5
adding in working functionality for the remote connector
2009-09-10 17:52:42 -07:00
16940097be
The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested.
2009-09-10 17:51:28 -07:00
552ba5334f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-10 18:14:34 +01:00
eabf5b6c3d
refactor: Replace some iar item name generation in tests with helper function
2009-09-10 17:40:07 +01:00
f5feb25dd1
fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0
2009-09-10 17:08:26 +01:00
729fbee287
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 04:07:08 -04:00
c41387b864
Formatting cleanup.
2009-09-10 15:57:53 +09:00
dc3798ddc3
* Another Timer lock
2009-09-10 00:31:14 -04:00
df9f80aabd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-09 16:20:46 -04:00
c605509da3
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
2009-09-09 16:20:19 -04:00
0cdec1fbc3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-09 18:11:02 +01:00
0683cf6e0d
Add test to check behaviour if an iar is loaded where no user profile exists for the creators
...
Disable generation of temporary profiles for now, instead record loading user as creator
2009-09-09 18:03:49 +01:00
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
b7256f2567
extend load iar test to loading into a deeply nested directory
...
correct bug associated with this
2009-09-08 17:42:07 +01:00
36a40e0295
refactor: change method argument name
2009-09-08 16:29:31 +01:00
46d64da830
minor: remove warning
2009-09-08 16:14:52 +01:00
76b21860e9
refactor iar name generation
...
slightly change the format of item archive names
2009-09-08 16:12:15 +01:00
fa1d79533e
Only allow iar load/save if user is logged in to the region simulator
2009-09-07 19:57:44 +01:00
71f1628578
make oar module logging a little less noisy
2009-09-07 19:11:16 +01:00
10b075a33d
change default iar filename
2009-09-07 18:42:53 +01:00
116933bee5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-07 18:26:53 +01:00
61c286f5d6
change iar load to make discrete inventory service requests rather than the cache
2009-09-06 22:07:35 +01:00
5640cac8e0
Add convenience functions to InventoryArchiveUtils for locating folders by assuming we're starting from the root
...
Change test methods to use convenience functions
2009-09-06 21:34:20 +01:00
a92afe8dca
change load iar test to use non-cache find item by path function
2009-09-06 21:26:27 +01:00
d8316810a1
remove now unnecessary parts of save iar test
2009-09-06 21:20:41 +01:00
881051c8cc
Convert iar write request to use inventory service requests rather than cache
2009-09-06 21:14:42 +01:00
79c22651d7
refactor: use direct scene reference in inventory archive read request
2009-09-06 20:16:56 +01:00
8616230fcf
refactor: replace some uses of iar module reference with scene instead
2009-09-06 20:04:18 +01:00
304c78bbbb
Temporarily re-enable save iar test by manually insert the item into the old cache during the test
2009-09-06 19:30:03 +01:00
2a8f66b221
Revising the user account data interfaces. No user functionality yet
2009-09-06 04:28:42 +01:00
8855c2e54c
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-05 03:00:50 -04:00
855fb58c96
* Moves ScenePresence SendCourseLocations to a delegate and provide a method to replace the delegate
...
* RegionCombinerModule replaces this delegate and distributes the CoarseLocationUpdates through the client connection in the region where the user would be if it was a separate region.
* Fixes Mini Map display on combined regions.
2009-09-05 02:58:35 -04:00
b6744a6566
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-04 22:31:10 -07:00
c48ec97817
Fixed some long-standing issues with appearance in HG1.
2009-09-04 22:30:30 -07:00
2c09634aed
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-04 20:19:50 -04:00
016a648a30
* Fixes various quirks rezzing in virtual regions.
...
* Breaks up the Client event registrations in Scene into methods of similar event types. The generic event registration registers all of the event types.
*Created symmetrical Un-Registration methods.
* Made the Registration and Unregistration methods public
* Hooks The events required for creating new prim and rezzing new prim into the proper scene.
2009-09-04 20:19:34 -04:00
7ca61e0174
Add ids to iar requests
...
Stop save iar test wrongly relying on thread pulsing (still disabled though)
2009-09-04 21:10:56 +01:00
4c560df8ac
If running tests manually, fail immediately on error
2009-09-04 19:22:09 +01:00
50a9e01dfa
* Last commit was a bit of a fail, it registered the root region for it's own permissions events again.
...
* This commit fixes that and does what the last one intended.
2009-09-04 04:41:43 -04:00
f7861a6bad
* Make the RegionCombinerModule also register to handle permissions for the virtual region scenes.
2009-09-04 04:25:56 -04:00
639bf79aec
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-03 12:42:25 -07:00
33133e23b1
Fixes seven leaky .BeginInvoke() calls
2009-09-03 12:36:51 -07:00
64fa23df7c
If a test dll fails, stop immediately rather than trying all the other test dlls
...
This is very useful behaviour if debugging test failures otherwise it's hard to pick out the test output
Also, some minor method shuffling in the iar module
2009-09-03 19:41:38 +01:00
56ddd6828c
Add copyright headers. Formatting cleanup.
2009-09-03 02:04:17 +09:00
bb0cbdc064
switching LandManagementModule to "new" region module scheme; cleaning
...
up method names in LandManagementModule (was a bit of a
mess). suppressing warnings re Constants.RegionSize.
2009-09-02 11:06:18 +02:00
05756e1fb9
warnings safari.
2009-09-02 11:06:18 +02:00
9505297fb1
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
...
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
2009-09-02 04:39:00 -04:00
2fc3f61a42
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-01 19:39:07 -04:00
afc72cc10e
* Fixes diagonal teleporting when in RegionCombining mode by adding 4 additional borders that have infinite distances perpendicular to the cardinal of the border surrounding the entire combined region. Recalculates this boundary each time AddScene is called.
2009-09-01 19:38:45 -04:00
39726f0fda
switching SerialiserModule to "new" region module scheme
2009-09-01 10:28:29 +02:00
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
895c612647
* When the RegionCombinerModule is active add an extra set of borders with Infinite distances around the whole AABB of the region
2009-08-31 16:29:27 -04:00
27b378ca8b
switching Archiver to "new" region module scheme
2009-08-31 17:25:16 +02:00
5209305615
oops. fixing missing argument.
2009-08-31 12:05:14 +02:00
86521adb7e
adding log message to vector render to inform about default font being used
2009-08-31 11:35:49 +02:00
953581698d
- making font name used by VectorRenderModule configurable: can be set
...
via
[VectorRender]
font_name = "Comic Sans MS"
in OpenSim.ini
- adding osSetFontName OSSL function
2009-08-31 10:30:10 +02:00
bbef5c344e
Remove typo version of ReplaceableInterface property from RegionCombinerModule.
2009-08-31 14:16:16 +09:00
59c8a02a24
* When the RegionCombinerModule is off, make borders have an infinite aabb perpendicular to the cardinal
2009-08-30 00:22:38 -04:00
2f40161f38
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-29 23:50:24 -04:00
efe737b895
Ok, merging the RegionCombinerModule with master.
2009-08-29 23:49:48 -04:00
33f36c9010
* Rename the RegionCombiner Module from PhysicsCombiner
2009-08-29 23:39:27 -04:00
3ccf3aba89
* Fixes looking up parcel permissions in virtual regions.
2009-08-29 16:24:03 -04:00
d45f871d8f
* Only lock the Borders when they're being changed, otherwise one avatar's movement could hinder another avatar's movement.
2009-08-29 03:36:41 -04:00
1a6b30e092
Add a slow cache cleaner thread. By default, the thread starts a cleanup
...
sweep every 10 minutes. If any texture data is older than 12 hours, it is
regenerated and the memory cache is refreshed. After each decode, the thread
delays for 5 seconds.
2009-08-29 05:54:38 +01:00
2a5b9f7740
the beginning of some changes to the decode cache to address concerns about
...
system load. This commit effectively disables expiration.
2009-08-29 05:29:54 +01:00
4b2e62fd3c
Make the j2kDecodeCache expire after 50 minutes (configurable). Alse allows
...
setting the path for it. This commit introduces NEW DEFAULT BEHAVIOR. To
retain the old behavior (eternal cache) you will need to change your OpenSim.ini
and set the timeout to 0.
2009-08-29 04:35:18 +01:00
3d6edc04a3
Implements osDrawPolygon, similar to already implemented osDrawFilledPolygon
2009-08-28 17:48:03 -03:00
ac718843d9
* Allow corner prim crossings. Previously this was only on a single cardinal direction
...
* Some leg work in getting avatar teleports into 'virtual regions' moved to the proper region.
2009-08-28 14:45:17 -04:00
33004b613d
Standardize FlotsamAssetCache header
...
Add mcortez to CONTRIBUTORS
Other minor tidy of CONTRIBUTORS
2009-08-28 18:12:30 +01:00
18c5dc0953
Try to cache system folders if they aren't already there when one is requested
...
This operation can be performed legitimately on standalones without a logged in user
2009-08-28 17:19:45 +01:00
7ff4c2e50b
Pull out distinct cache system folders and drop cache methods in InventoryCache
2009-08-28 17:07:17 +01:00
7f8df4242b
Correct build break
2009-08-28 12:58:10 +01:00
d649194be3
minor: formatting and comments
2009-08-28 12:52:40 +01:00
cf58c0ab08
minor: remove some commented out iar test code
2009-08-28 12:01:21 +01:00
65dda8a795
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-27 19:36:52 -04:00
d704e62b39
Remove OpenSim.ini comments from the top of FlotsamAssetCache.cs to avoid duplication and divergence with config-include/FlotsamCache.ini.example
2009-08-27 21:49:32 +01:00
40fbdaaac4
Apply http://opensimulator.org/mantis/view.php?id=3829
...
Fix file access violation on Flotsam cache
Thanks mcortez
2009-08-27 21:25:16 +01:00
54e05a083d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-26 11:48:05 -04:00
efb287f28f
Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using arrow, diamond, round and flat caps.
...
* Made image request safer, if it can't find an image for any reason, draws a square where the image should be and a message alerting the user.
2009-08-25 10:32:45 -03:00
9c9fa51b0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
2009-08-25 10:28:22 -03:00
b03eeeb9f6
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044 . Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
...
* Removed left-overs from AssetInventoryServer.
2009-08-22 10:24:26 -07:00
7923fd29a0
Adds osDrawPolygon to OSSL. Works a little different then other OS Drawing functions, this one has no start and end point, but a number of points that will form the desired polygon. Only FilledPolygon implemented so far.
...
* Also added some LSL transparent type conversion, as it's done in LSL scripting (string to integer, float to string, etc)
2009-08-21 21:12:22 -03:00
e1b38ff001
* It turns out that Physics heightmap values were being stored in managed memory in _heightmap and using multiple heightmaps caused them all to overwrite each other and the last one was the heightmap for all of the regions. This fixes that. It also reduces the terrain resolution to half.
2009-08-21 13:22:49 -04:00
158ad39df0
Add copyright header. Formatting cleanup.
2009-08-21 15:47:55 +09:00
c9b52cd0b6
* Adds PhysicsCombiner Module
...
* May rename this later
2009-08-20 23:25:40 -04:00
01f394d203
* Fleshes more of NPCModule out.
...
* Implements some OSSL commands:
key osNpcCreate(string user, string name, vector position, key cloneFrom);
void osNpcMoveTo(key npc, vector position);
void osNpcSay(key npc, string message);
void osNpcRemove(key npc);
* Untested. Requires ThreatLevel.High.
2009-08-21 11:14:55 +10:00
181b992b4a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-20 19:25:52 -04:00
297393f349
Remove a load-order dependency in inventory transfer that was biting
...
Windows users
2009-08-20 21:05:00 +01:00
4c8bcd2ff6
Add some output (at DEBUG level) to the message transfer module to aid
...
in tracking down an initialization failure.
2009-08-20 20:19:08 +01:00
6e35ddb0e9
Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in SQlite. Fixes most grief in
...
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 17:35:42 -07:00
289439c832
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-19 14:43:18 -04:00
d519f1885f
Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently).
2009-08-19 10:56:08 -07:00
4382f28efc
Async purge so that the client thread doesn't wait.
2009-08-19 00:33:02 -07:00
c5af39239f
A better purge of trash folder.
2009-08-19 00:13:51 -07:00
e5f33e7505
GetFolderItems implemented. It's not being called, but it might.
2009-08-18 22:36:03 -07:00
124f66bfc2
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
2009-08-18 22:17:47 -07:00
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
d7aa622050
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 15:28:16 -07:00
df889855ec
Commented out one IAR test, because it's failing and needs attention from justincc or arthursv. I think the mock inventory service needs a little bit more beef.
2009-08-17 15:16:21 -07:00
9ad3e72ae1
Did I say that i don't like git? Remove some stuff that shouldn't have
...
gone in.
2009-08-17 22:06:51 +01:00
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
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
ad02aefaee
Fix argument index in log4net call. ( fixes #4003 )
2009-08-17 01:46:00 +09:00
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
30ce56e721
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-15 13:10:21 -04:00
8000812700
* part one of adding physics combining
2009-08-15 13:10:10 -04:00
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
e17a2331a0
* Re-enable TestLoadIarV0_1ExistingUsers()
2009-08-14 20:38:56 +01:00
ff28ecee1b
Re-enable TestSaveIarV0_1()
...
Implement more parts of TestAssetService
2009-08-14 20:07:13 +01:00
a668a5b0d3
Add standard doc and standard doc formatting to IAssetService
2009-08-14 19:59:42 +01:00
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
bb513c1d88
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
2009-08-14 11:32:25 -07:00
957962b482
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
2009-08-14 19:06:24 +01:00
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07:00
70d7c97e94
Doing session lookup in the right way.
2009-08-14 09:57:18 -07:00
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
034c9cf606
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
2009-08-13 17:34:15 -07:00
5246dc33dc
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
2009-08-13 14:10:12 -07:00
6b9cc6c48d
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
2009-08-13 11:30:29 -07:00
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
3669115d60
Some small fixes
2009-08-13 13:25:33 +01:00
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
b0292d59a5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-12 20:40:49 -07:00
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
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09:00
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
b3b506cba2
Better test for dropping inventory cache and writing out debug messages.
2009-08-12 09:31:33 -07:00
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
bf3f376b10
Fixed test for detecting when user is no longer in sim.
2009-08-11 12:55:46 -07:00
764ec7ba0a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-11 12:31:02 -07:00
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
dc897b2288
Merged with origin, and resolved one conflict in LoginServiceTests.cs
2009-08-11 10:51:49 -07:00
263f32a493
Improved test for system folders. Removed log messages.
2009-08-11 10:42:44 -07:00
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
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
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
f9b60f5c34
Disable test again. Ho hum.
2009-08-11 17:05:01 +01:00
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
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
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
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
9f95ec4998
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-10 16:02:33 -07:00
0c47f8e7ab
Changed RequestRootFolder to GetRootFolder
2009-08-10 16:02:09 -07:00
eba23048ca
Replace the Replaceable modules name
2009-08-10 23:08:22 +01:00
0d8284c7a1
Removed IAssetCache.
...
WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 08:14:57 -07:00
a5a5e44246
Re-removing 2 lines that got added back on Melanie's commits. git hickup.
2009-08-09 15:17:42 -07:00
474f58faf5
Finish the renaming and mae things compile again
2009-08-09 22:25:15 +01:00
11d72f270d
Rename UserData to UserAccount data
2009-08-09 21:53:11 +01:00
6a6dd66129
More removal of HG2 code, this time authentication module and handlers.
2009-08-09 14:21:47 -07:00
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
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
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
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
07e6a492a1
Disable all IAR tests for now due to possible failure-causing race condition
2009-08-06 19:35:52 +01:00
bc6de6f5f0
Disable TestReplicateArchivePathToUserInventory() pending more investigation
2009-08-05 20:05:22 +01:00
07e00e110d
Reinstate TestLoadIarV0_1ExistingUsers(), removing unnecessary wait
2009-08-05 19:38:45 +01:00
9e5736eeec
insert a little more debug info for TestReplicateArchivePathToUserInventory()
2009-08-05 19:06:07 +01:00
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
1b65bd5861
Recomment TestReplicateArchivePathToUserInventory() for now due to occasional test fail
2009-08-05 18:21:22 +01:00
9e0f1b7fef
reinstate TestSaveIarV0_1()
2009-08-05 18:01:18 +01:00
e5904c3883
remove some more mono compiler warnings
2009-08-05 17:39:32 +01:00
190bdc8a2e
* Remove some mono compiler warnings
2009-08-05 17:33:23 +01:00
3323413f53
reinstate TestReplicateArchivePathToUserInventory()
2009-08-05 17:17:20 +01:00
4cbf0444df
* Tweak the caps manager so that the NPCAvatar works again.
2009-08-01 14:26:00 +00:00
4ce5c894cf
Add copyright header. Formatting cleanup.
2009-08-01 05:11:47 +00:00
ae8d3ab22e
* Fix a locking issue in the EventQueue
2009-07-31 20:53:35 +00:00
23a8895d29
* Fixed another potential httpserver leak.
2009-07-30 18:16:00 +00:00
22a533b675
Thank you, dmiles, for a patch that allows more differentiated script
...
permissions for YP scripts.
2009-07-30 15:38:42 +00:00
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
f727f26bcc
* An attempt to fix mantis #3953
2009-07-29 20:32:54 +00:00
cbeebc209d
Thank you, coyled, for a patch to change Flotsamcache path generation
...
to avoid directory overflow.
2009-07-29 17:21:36 +00:00
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
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
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
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
a133e83f3a
Formatting cleanup.
2009-07-23 15:32:11 +00:00
4b84bdb77e
Thank you, patnad, for a patch to advance the UrlModule's functionality.
...
Mantis #3712
2009-07-22 22:16:37 +00:00
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
5815162d7e
minor: remove some mono compiler warnings
2009-07-15 20:49:58 +00:00
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
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
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
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
5ba499a759
comment out some excessively verbose eventqueue debugging messages
2009-07-05 07:17:12 +00:00
412b555c27
Restore some lost functionality tot he combat module. Code that used to
...
reside in the economy module was lost in the shuffle when that was moved
to forge. Now it's where it belongs.
2009-07-02 02:46:40 +00:00
3dc2010da6
From: Chris Yeoh <yeohc@au1.ibm.com>
...
Attached is a patch that changes the oar file saving of creation date/time to an integer
instead of a string. I did this after justincc emailed me saying there is a problem
with internationalisation doing it the old way and I said I'd fix it. Its been
tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
2009-06-29 15:05:12 +00:00
652bcf91d5
- fixes a "collection out of sync" exception in the ODE physics
...
engine, caused by an "avatar infinite position" occurring under
heavy load.
- fixes "value too small" exception in ChatModule
2009-06-25 07:39:48 +00:00
9d07584ea1
Allow "Take Copy" with copy only permissions if you own the object. Trans
...
is only required when taing an object you don't own, now.
Fixes Mantis #3838
2009-06-24 23:45:21 +00:00
77ebb7c9f3
Committing RemoteUserServiceConnector out connector, local user service
...
connector and the glue code.
2009-06-22 13:14:48 +00:00
65d48a5e60
Formatting cleanup, ignore some generated files.
2009-06-22 11:04:09 +00:00
142b481e03
Update svn properties.
2009-06-22 10:07:27 +00:00
7d4f541d43
Suppress exception dump when informing friends in another region about login
...
or logoff. Regions come and go and we can't throw just because someone
took their region off the grid, or crashed.
2009-06-21 22:40:21 +00:00
e4d26d7bfa
When a shared module hooks OnClientClosed, it has no way of finding
...
out which client connection has closed. So, in multi-region sims, things
can get messy fast.
This introduces a second parameters, which is a Scene object ref. Minor
adjustments to custom modules may be required due to this change.
2009-06-19 20:46:17 +00:00
19b52d13e2
Thanks cmickeyb for a patch that checks for null assets in Cenome asset cache - Mantis #3819
2009-06-19 17:08:23 +00:00
00d042f3d1
Thanks Michelle Argus for Mantis #0003742 : Terrain editor - Flatten tool lowers Land
2009-06-18 23:02:12 +00:00
f243dddc04
* Corrected CAPS namespaces
...
* "luke, use the sed"
2009-06-18 14:33:35 +00:00
ce7de3581c
Implementation of a simple authentication service + in connector in route to making HGInventory (client access) work in standalone again. This is the refactoring of what was/is there, but done in the new model. Not complete yet, but key authentication works. It should be enough to make HGInventory work again soon.
2009-06-17 03:52:39 +00:00
6cb7ecd99c
Renamed two of the in connector modules, to make things consistent.
2009-06-15 00:29:37 +00:00
54d44e370b
Removing the OpenSim.SimulatorServices project. All of those region modules are now in CoreModules/ServiceConnectorsIn, where they belong.
2009-06-15 00:17:17 +00:00
380f59d0ff
Factoring out "land_data" / RequestLandData that was hanging off of IGridServices, erroneously. Not sure when this is used, but now it is implemented in the new model of service connectors. Hopefully it works.
2009-06-14 23:00:23 +00:00
664dd58cd9
Fixes Mantis #3793 . Committing thomax/Snoopy's patch to allow deeding of objects, with changes:
...
- Set OwnerID = GroupID for deeded objects.
- Close a security loophole that would have allowed a user with deed rights in a group to deed ANY object to that group, even if it's not owned by them and/or not set to that group
- Set LastOwnerID correctly. Handle objects vs. prims correctly.
2009-06-14 21:44:34 +00:00
8d0eb3307f
Update svn properties.
2009-06-14 21:37:50 +00:00
6abffedab5
Renamed Region/CoreModules/ServiceConnectors to Region/CoreModules/ServiceConnectorsOut. No functional changes.
2009-06-14 19:44:56 +00:00
a0b68178b8
Bug fix in remote neighbour connector.
2009-06-14 16:26:14 +00:00
7a9c85526c
Pulled out HelloNeighbour into its own service, INeighbourService, which may get more functions as we go along. It's a very simple service and service connectors, and it served primarily to establish the design of services that dependent on Scenes and that must always have a local connector. More refactoring coming, as this showed how to do it right.
2009-06-14 15:35:09 +00:00
9f2ddfd167
* Temporarily resolve another problem in http://opensimulator.org/mantis/view.php?id=3741 by disabling the loading of OAR creation information
2009-06-12 20:00:26 +00:00
f9782a1085
* minor: removing some logging stuff accidentally left in on the last commit
2009-06-12 15:45:38 +00:00
45342067f5
* Move standalone login setup in LLStandaloneLoginmodule to RegionLoaded() from AddRegion()
...
* This is necessary to avoid a dependency problem where LLStandaloneLoginModule references IInventoryService before the LocalInventoryServiceConnector is registered
* Correct some copypasta log messages in LocalInventoryServiceConnector
2009-06-12 15:41:53 +00:00
cb6baacc31
* minor: remove one mono warning
2009-06-12 14:29:42 +00:00
874df490fb
* fix build break: sigh, must remember to build before committing
2009-06-12 14:23:31 +00:00
4e526778b7
* minor: make control file loading code consistent
2009-06-12 14:18:01 +00:00
15b8641bef
* minor: if OAR saving receives assets after timeout, just print warning, don't accidentally go on to process them
2009-06-12 14:00:50 +00:00
86043c431f
* minor: remove warning from unused field
2009-06-12 13:37:08 +00:00
d4ed7b03af
* Fixed a few more async calls. Still not uncommented, some asserts still failing
2009-06-11 20:50:23 +00:00
2afd733229
Fixes mantis #3803 . Thanks jhurliman.
2009-06-11 20:27:13 +00:00
6c1d6283e6
Small improvement in the IAR tests, but these tests are still showing random behavior, so they are still commented out.
2009-06-11 19:12:20 +00:00
156604e28e
InterServiceInventoryService references *almost* completely removed from the simulator. Only a couple left, not important. Also updated the login tests -- Justin, this time I was able to fix this by myself :)
2009-06-11 03:00:25 +00:00
6242b01ac8
Removing the default reading of AssetCaching on all cache modules.
2009-06-10 16:48:26 +00:00
b465dd7eb3
Reverse the default setting in Flotsam Asset Cache. Nothing should be the default
2009-06-10 15:36:44 +00:00
1874c635ea
Commenting the IAR tests for now until we understand how to set up things in this new inventory model.
2009-06-10 15:18:07 +00:00
0f367bd7bb
Heart surgery no.2: the inventory service hooks.
...
Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.
2009-06-10 13:18:32 +00:00
a23d64dec1
Formatting cleanup.
2009-06-10 04:28:56 +00:00
ca52c3ef26
Letting the Flotsam cache be enabled even when [AssetCache] section is missing. Thank you mcortez!
2009-06-09 20:20:30 +00:00
a7fcacf8f3
Formatting cleanup. Ignore some generated files.
2009-06-09 18:07:35 +00:00
135ff63c3d
Update svn properties.
2009-06-09 17:48:22 +00:00
9c726fb178
Thank you Snoopy, for a patch that implements group permissions.
...
Applied with changes:
- removed spammy debug message
- corrected tab formatting
2009-06-09 08:15:34 +00:00
759636f37e
From: Alan Webb <alan_webb@us.ibm.com>
...
This change addresses two issues:
[1] It adds a flag field to the blendface call which allows the
caller to indicate whether or not the generated asset is
temporary, and whether or not the asset being replaced should
be explicitly retired fromt the memory cache. The decimal
values correspond to:
0 - Permanent asset, do not expire old asset
1 - Permanent asset, expire old asset
2 - Temporary asset, do not expire old asset
3 - Temporary asset, expire old asset
'3' corresponds to the default behavior seen today, and is
the continued behavior of the non-blendface calls.
[2] The dynamic texture routines are highly-asynchronous and can
be scheduled simultaneously on a multi-core machine. The nature
of the texture management interfaece is such that updates may
be lost, and the nature of asynchornous operation means that
they may be processed out of order. A lock has been added to
ensure that updates are at least atomic. No attempt has been
made to enforce ordering. The lock applies to the SceneObjectPart
being updated and is held for the lifetime of the TextureEntry
used to carry texture updates (the one instance carries all
faces supported by the prim).
Users of these services should remember that the dynamic texture
call is asynchronous and control will be returned *before* the
texture update has actually occurred. As a result, a isubsequent
GetTexture call may not return the expected asset id. A script
must wait for the corresponding TEXTURE_CHANGED event before
retrieving any texture information.
2009-06-09 06:39:27 +00:00
0356fef9ab
Updating the flotsam asset cache. Thank you, mcortez!
...
Fixes Mantis #3784
2009-06-08 20:09:49 +00:00
b87f982a7e
Bug fix. Adding the asset to the cache after a DB get.
2009-06-08 19:35:36 +00:00
16d5003274
Added more functions to IInventoryService. Unsure about whether all of these are really necessary.
2009-06-08 03:09:24 +00:00
1ad237a8a7
First draft of inventory service connectors, and service implementation. No handlers yet, this is just the OUT part for now. It's not active and nothing in the simulator uses this yet. Just checking it in to start sharing with others. There are a couple of interesting software design points that could use other devs opinions.
...
Hopefully I added all needed files.
2009-06-07 19:00:55 +00:00
593942b195
* Fix problem where known missing assets would stop save oar ever completing
...
* Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response
* So make asset service return http status NOT FOUND rather than OK in accordance with REST
* and interpret this correctly in the async response so that a null object is sent back
* This means that this fix won't be active until both region simulator and server reach this revision
2009-06-05 16:14:22 +00:00
bfea077508
* Add oar saving timeout
...
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds
* Timeout executes abort, since missing assets in an OAR seems bad
* This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service
* This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
2009-06-05 13:48:43 +00:00
9f932a4205
Thank you, thomax, for a patch to provide finer-grained access control to
...
scripting.
Fixes Mantis #2862
2009-06-05 09:47:42 +00:00
f992db6807
Committing mcortez's FlotsamAssetCache after several positive reviews.
...
Thank you, mcortez!
2009-06-05 04:58:55 +00:00
ffac6f94f0
Changed a comment to reflect changes in config.
2009-06-04 18:41:19 +00:00
c6cef4bad5
Comment out unused variables / private fields to avoid compiler warnings.
2009-06-04 03:58:04 +00:00
5f923f0632
Add copyright headers.
2009-06-04 01:09:18 +00:00
007016ecd2
Update svn properties.
2009-06-04 00:51:02 +00:00
717fd3b5b9
From: Chris Yeoh <yeohc@au1.ibm.com>
...
This patch adds oar file date and time (UTC) meta data to an oar file
when it is created. It also adds a unique ID, though this id does not
in anyway identify the machine that the oar file was created on.
When an oar file with this meta data is loaded this extra information
is saved with the region settings and available via LSL through:
- osLoadedCreationDate()
- osLoadedCreationTime()
- osLoadedCreationID()
If there is no meta data these fields will be blank. Subsequent oar
file loads will erase the information for the previous oar file
load. Persistence has only been implemented for MySQL, the other
backends need updating.
Overall this allows us to much more easily identify the specific version of
software that clients are using. Its very straightforward to edit the oar file
to change the ID string to be something more human friendly.
Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql
required for the MySQL DB migration.
btw I had a chat with justincc about this a few weeks ago since he
wrote the oar file import/export and he sounded happy to accept
something that included date/time information but didn't want anything
that would silently leak private information like machine names.
2009-06-03 12:48:04 +00:00
074b66ddcf
From: Chris Yeoh <yeohc@au1.ibm.com>
...
- fixes wild swings in memory usage related to usage of GetDrawStringSize()
We've been seeing wild swings in memory usage and a large chunk of
memory leak. From analysing this it's pretty clear that the mono
garbage collector is rather buggy! When exercised heavily it looks
like it frees more than its meant to resulting in crashes.
GetDrawStringSize() measures the size in pixels of text. To do this
memory for an image is allocated and used to call the GDI text
measure functions. Although no reference to the temporary memory
for the measuring is kept, it takes quite a while for the mono
garbage collector to clean up - so if lots calls to
GetDrawStringSize() are made at once there can be a spike in memory
usage. If the garbage collector is not fast enough then the GDI
layer runs out of memory. It also looks like the garbage collector
is not always reclaiming all of the memory.
I've attached an OpenSim patch which works around the garbage collector
issues. Instead of dynamically allocating memory for measuring
text sizes, it serialises (on a per region basis) access to a single
block of memory. The effect of this is to be nicer to the garbage
collector as it has a lot less work to do, at the cost of some
theoretical loss in performance (nothing noticeable with our tests
which hit it pretty hard).
OpenSim still does leak memory slowly, but it is a lot more stable
with this patch. I suspect that either the garbage collector misses
bits of freed memory or the GDI/cairo layer leaks a bit each time a
texture is created. Thats going to be a lot harder to hunt down, but
for reference if someone has OpenSim running on Windows it would be
interesting to see if it has the same problem as it would tell us if
its a mono/GDI problem or an OpenSim problem.
2009-06-03 12:39:44 +00:00
25a0a56570
From: Alan Webb <alan_webb@us.ibm.com>
...
Modify dynamic texture handling so that an explicitly targetted
face is not scheduled for immediate expiration. The requirement
for precaching explicitly requires these assets to persist. They
do however remain temporary.
This approach leaves the legacy mode of operation (ALL_SIDES)
unchanged in this respect.
2009-06-03 12:21:14 +00:00
9e3b592fa3
Thank you Imaze Rhiano for a patch that implements Cenome Memory Asset Cache (Mantis #3759 )
...
See the files: bin/config-include/GridCommon.ini.example and bin/config-include/StandaloneCommon.ini.example to configure and enable this caching method.
2009-06-03 08:41:08 +00:00
528db43326
revert r9765 due to too many errors on some compilers. Affects Mantis #3759
2009-06-03 02:03:11 +00:00
b38be1a7fd
Thank you Imaze Rhiano for a patch that implements Cenome Memory Asset Cache (Mantis #3759 )
...
See the files: bin/config-include/GridCommon.ini.example and bin/config-include/StandaloneCommon.ini.example to configure and enable this caching method.
2009-06-02 22:42:47 +00:00
5c42143a7b
* Add simple original xml serialization test
2009-06-02 15:24:29 +00:00
412295ccde
* Add simple original sog xml serialization test
2009-06-01 18:03:51 +00:00
f6badc528b
* minor: change the name of one serialization method to match its counterpart
2009-06-01 17:38:11 +00:00
ecbeb5cea1
* Fix race condition in save oar
2009-06-01 16:00:46 +00:00
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
35b450d41d
Add copyright headers, formatting cleanup, ignore some generated files.
2009-05-31 18:35:00 +00:00
db2c4ab94c
Update svn properties.
2009-05-31 16:26:18 +00:00
822c2176df
Forgot to add this to my last commit 2 days ago. Async in the HGBroker too.
2009-05-30 16:22:15 +00:00
4aad6a07ff
* refactor: Remove redundent prim id attribute on Scene.AddSceneObject()
2009-05-29 21:01:18 +00:00
6eb191c87b
* Add save xml2 serialization test
2009-05-29 20:20:47 +00:00
9021bb231c
* minor: move common serialization test code into fixture setup
2009-05-29 16:27:43 +00:00
fa04937a82
* Add xml2 load test
2009-05-29 16:11:33 +00:00
1e9cb2f8fc
Making the delegate handlers async in async Get, to make things consistent. Them being synchronous in certain cases (asset in cache, for example) may account for slowness reported by folks in osgrid when they have the cache module on. Turns out that some of the provided handlers do non-trivial processing (the ones coming from J2KImage, for example), which means that the several asset requests that hit the cache end up being synchronous. The jury is still out on this.
2009-05-29 01:26:53 +00:00
0094556d04
Instrumenting GlynnTuckerCache to find out the hit rate.
2009-05-28 21:04:10 +00:00
5db649538a
* Tweak to above
2009-05-28 19:20:49 +00:00
2feb218817
* Makes grid announcements more prominent.
2009-05-28 19:19:10 +00:00
4b151b83a8
* Oops. Forgot Initialise needs tweaking between IRegionModule and ISharedRegionModule.
2009-05-28 19:03:27 +00:00
561d6c1cdc
* Converts recently added OGSRadmin to IRegionModule because I cant be arsed figuring out Mono.Addins.
2009-05-28 18:59:18 +00:00
940b5567a0
* Adds OGS RAdmin class. Adds primitive remote admin functions for gridservers to perform on region servers. Used for grid-wide announcements, etc.
2009-05-28 18:27:08 +00:00
a7b49084ad
* May make the terrain flatten brush behave like Second Life(tm)'s client expects. May break everything. You decide!
2009-05-28 15:27:15 +00:00
e0ef697402
Adding the GlynnTucker cache module as the default choice in .ini's.
...
Minor log message change in the module itself.
2009-05-27 16:11:23 +00:00
a576cca59e
Update svn properties.
2009-05-27 14:30:33 +00:00
ce5225e6dc
Experimental alternative cache module implementation, using GlynnTucker.Cache.dll.
2009-05-26 21:24:18 +00:00
0b9076cd17
Revert a change I made to get a better URL because it failes under mono
2009-05-26 01:38:32 +00:00
2f74a7e3a6
Couple of tweaks to the URL module: handle script reset gracefully and
...
stop crashing http server threads.
2009-05-26 01:27:22 +00:00
582c20b1c4
* reseparate inventory item creator id and creator uuid
...
* unfortunately, while the client requires uuids and we want to be able to have arbitrary string ids, these cannot be kept in sync
* I think the problems last time were due to a serialization change
* So the major inteface version has been bumped to take care of any lingering issues here.
* This means that region servers beyond this revision can only connect to similarly uptodate grid services, and vice versa
2009-05-25 19:54:47 +00:00
eaa89f5a03
oops: wrong "path" in addin.xml
2009-05-25 12:27:17 +00:00
d4d9d8ed8f
converting CapabilitiesModule to new region module scheme
2009-05-25 11:11:04 +00:00
4e64bf9360
Prevent group deeded objects from being returned by the group return option
...
unless the user has that permission through the group.
2009-05-24 17:29:40 +00:00
ca75c101ec
Allow the perms module to inspect and modify the list of objects to return
...
for more fine-grained control
2009-05-24 17:20:47 +00:00
c028d0a3c1
Make group permissions control what a user can return.
2009-05-24 16:55:34 +00:00
f3f7d60367
Add a new permissions check for bulk object returns.
2009-05-24 16:11:35 +00:00
fb6d314d4d
This should make HG asset transfers work much better. It now uses HGUuidGatherer, which is a subclass of UuidGatherer. Hence, on-line HG asset transfers use exactly the same UUID collection code as save oar/xml. If it doesn't work, it's Justin's fault :D
2009-05-23 17:51:13 +00:00
31baeef469
* Pipes requestors IP address through all XmlRpcRequest delegates. This is needed to be able to 'NAT-wrap' the login sequence.
...
* If you have something using XmlRpc that isn't in core, change your method signature from:
(XmlRpcRequest request)
to:
(XmlRpcRequest request, IPEndPoint remoteClient)
2009-05-23 06:05:20 +00:00
a3145e4e5a
* Reintroduce save iar test, which wasn't working because the asset service hadn't been manually post intiailized
2009-05-22 19:59:45 +00:00
3b689e506f
From: Alan Webb <alan_webb@us.ibm.com>
...
Changes to support client-side image pre-caching in the region. This
commit adds an additional calling sequence to the DynamicTexture data
and URL calls. The new interface allows a dynamic image to be loaded
into a specific object face (rather than the mandatory ALL_SIDES
supported today.
This is in part fulfilment of ticket #458 .
2009-05-22 16:22:49 +00:00
1d02636c27
cleaning out warnings.
...
NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?
2009-05-22 14:57:00 +00:00
912be7a2ac
converting Chat module and Concierge module to new style region modules
2009-05-22 14:25:50 +00:00
1df80943b0
dropping sex from SceneBanner...
2009-05-22 14:21:44 +00:00
da170cde46
Cleaning up a few HG things. HG Posts may now work in grids, but if the home grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection.
2009-05-22 04:23:59 +00:00
20383a61b8
Thank you, StrawberryFride, for a patch to fix SceneBan behavior.
...
Applied with changes (commented the logging entirely, since Linux defaults
to debug level)
Fixes Mantis #3689
2009-05-20 11:27:15 +00:00
e0bc5c5db2
Add copyright headers, formatting cleanup.
2009-05-20 01:32:06 +00:00
01ca3a91ad
* Take another attempt at http://opensimulator.org/mantis/view.php?id=3191
...
* Return something more sensible if a file isn't found
2009-05-19 19:41:01 +00:00
8559f9bbba
From: Alan Webb <alan_webb@us.ibm.com>
...
The image render module is returning everything twice. Once with
data, once with null. This change adds a return to stop this
behavior. This was not apparent until I added a message to the
catching routine which issued a warning message when no data was
returned.
2009-05-19 18:34:04 +00:00
88f17010b7
Add initializing m_scene if it's not null. Marking MyScene as [Obsolete]
...
because it will be removed soonish. This is NOT the way to go.
Thanks, mpallari, for pointing this out.
Fixes Mantis #3684
2009-05-19 16:26:20 +00:00
23d902be42
Remove the old asset cache and local services and the configurations for them
2009-05-18 23:18:04 +00:00
df16532858
Bug fix and config rename.
2009-05-18 23:15:50 +00:00
13da5a9fba
Finished HG Service Store. Not fully functional because of problems with asset.ID insisting on being a UUID string.
2009-05-18 20:04:59 +00:00
Diva Canto