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
John Hurliman