7c925744f6
Some OSGrid specific changes, please use this or later for OSGrid use
2009-09-15 07:55:29 +01:00
1ad35f65b3
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-14 16:30:36 -04:00
dc925416d7
* fix missing lock on XMLRPC GroupsModule
2009-09-14 16:30:14 -04:00
ecbdb7d1f0
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-14 10:41:41 -07:00
6414db9068
OK, that didn't work. Those libs are used in OptionalModules after all.
2009-09-14 10:40:46 -07: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
69b19a3b85
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-14 10:29:28 -07:00
2f3cf540ca
Removed dependencies that OptionalModules had on IronPython and Puma. They are not used.
2009-09-14 10:28:28 -07:00
5a64ca4642
label load and save iar commands as experimental.
2009-09-14 16:57:47 +01:00
dd4d70eafe
re-enable load and save iar commands
2009-09-14 16:54:36 +01:00
19c5c8b98d
fix to preserve UTF8 encoding in saved script state.
2009-09-14 16:14:59 +02:00
feccfe4096
* Add the RegionCombinerModule back
...
* Yay anonymous delegate in an anonymous delegate.
2009-09-13 19:09:48 -04:00
3a9e1cf0a3
Temporarily removing the RegionCombinerModule to debug a mono assert on linux
2009-09-13 18:43:20 -04:00
ed475f21ee
* Use the BeginInvoke methodology instead of the FireAndForget methodology to try to mitigate a mono assert. Same functionality done a different way.
2009-09-13 18:28:45 -04:00
3562d75c17
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 18:12:44 -04:00
eadea36142
* Move nested classes from the RegionCombinerModule into their own file.
...
* Rename the RegionCombinerModuleIndividualForwarder to RegionCombinerIndividualEventForwarder so there's no possibility that mono.addins sees any names similar
2009-09-13 18:12:24 -04:00
efc43aa0d9
Change the type value for given folders to -1. Prevents inventory blowups
2009-09-13 18:24:00 +01:00
fe4f312d55
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 07:28:08 -04:00
38e462ed8a
* Milestone GridFriendly reached so Adding CombineContiguousRegions to the OpenSim.ini.example
2009-09-13 07:27:24 -04:00
4241cdc929
* More comments in the RegionCombinerModule
...
* Changed the Destination ID to 0 in the TeleportFinish Event (why did we have it as 3?)
* Added border based trigger teleports
* Fix MakeRootAgent border cross tests for ensuring that the position is inside the region to use the borders to figure out if it's outside the Region
2009-09-13 07:20:18 -04:00
01ec93945e
Formatting cleanup.
2009-09-13 13:56:09 +09:00
40c3ac4aeb
Guarding the unpacking of the email field introduced by Robsmart. Most profiles don't have it. This may fix mantis #4134 .
2009-09-12 09:30:14 -07:00
cfa0cbdffa
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-11 21:53:16 +01:00
c8ddc5b301
Changed GetRegionByHandle to GetRegionByPosition -- more generic.
2009-09-11 13:55:23 -07:00
496b368334
Add a using() block around the timer script
2009-09-11 21:52:49 +01:00
5de1ec735c
Added GetRegionByHandle.
2009-09-11 13:17:37 -07:00
f6c4221a0d
Removed RequestLandData from IGridService because it's already in another place.
...
Moved GetMapBlocks to a new interface IMapService.
2009-09-11 13:08:43 -07:00
8fd604dcd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-11 12:55:25 -07:00
44343ed94d
Changed names of methods in IGridService.
2009-09-11 12:54:58 -07: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
44f1092b83
moved AuthorizationRequest and AuthorizationResponse to IAuthorizationService to keep service dependencies together.
2009-09-11 09:23:09 -07: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
e7934c9da0
minor: correct my name in one of the library bundled scripts
2009-09-11 12:04:40 +01:00
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
b5c8925fdf
added AuthorizationRequest and AuthorizationResponse objects for passing Authorization messages over http. Added handling code for these in the AuthorizationServerConnector and AuthorizationServicesConnector
2009-09-10 17:53:05 -07:00
953ef780c5
adding in working functionality for the remote connector
2009-09-10 17:52:42 -07:00
16940097be
The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested.
2009-09-10 17:51:28 -07:00
552ba5334f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-10 18:14:34 +01:00
eabf5b6c3d
refactor: Replace some iar item name generation in tests with helper function
2009-09-10 17:40:07 +01:00
f5feb25dd1
fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0
2009-09-10 17:08:26 +01:00
729fbee287
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 04:07:08 -04:00
1c878ec425
* Fix an off by one error on visible neighbors in the 'RequestNeighbors' method. This off by one error showed one extra row of neighbors on the north and east side
2009-09-10 03:25:55 -04:00
c41387b864
Formatting cleanup.
2009-09-10 15:57:53 +09:00
656de67d85
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 00:31:32 -04:00
dc3798ddc3
* Another Timer lock
2009-09-10 00:31:14 -04:00
0034dd043f
Many databases contain folders with invalid folder ID. Folder IDs are
...
supposed to be within -1 .. 22 and other values break inventory loading.
This patch fixes it and allows inventory to load. Invalid folder types
will be treated as ordinary folders.
2009-09-10 00:33:00 +01:00
df9f80aabd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-09 16:20:46 -04:00
Melanie