dr scofield (aka dirk husemann)
39726f0fda
switching SerialiserModule to "new" region module scheme
2009-09-01 10:28:29 +02:00
dr scofield (aka dirk husemann)
ef6c0bd7d8
cleanup.
2009-09-01 10:28:29 +02:00
Teravus Ovares (Dan Olivares)
2245e2977e
* The return of fuzzy borders!
2009-08-31 23:16:24 -04:00
Teravus Ovares (Dan Olivares)
3718bbc6a5
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-31 22:51:03 -04:00
Teravus Ovares (Dan Olivares)
c09884a467
No more fuzzy borders
2009-08-31 22:50:27 -04:00
Teravus Ovares (Dan Olivares)
2068b6714a
* -2 on the south and west side, -1 on the north and east side. Fuzzy borders! yay
2009-08-31 21:40:06 -04:00
Melanie
c89fc36f28
Applying Mantis #4079 . Thank you, dslake
2009-09-01 02:17:08 +01:00
Teravus Ovares (Dan Olivares)
de1c2a51e2
* Put Borders back the way they were to resolve the endless ----> crossing into region X,Y
2009-08-31 21:11:04 -04:00
Melanie
29df190a3f
Baad git, baad baad git.
2009-09-01 02:02:52 +01:00
Melanie
22457c9843
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-01 01:56:59 +01:00
Melanie
e458a87e91
Experimental. Set attachment flag early on rezzing from inventory.
2009-09-01 01:53:54 +01:00
Teravus Ovares (Dan Olivares)
fed089971e
* Previously south and west border were required to be -1 for border crossings diagonally to work.. but.. seems they're working now without it.. and maybe it will help attachments.
2009-08-31 20:36:06 -04:00
Teravus Ovares (Dan Olivares)
b8d21d9eae
* Get rid of some debug info and kill the code to make a large AABB until I can figure out how to detect the fact that the system is done starting up new regions.
2009-08-31 20:10:08 -04:00
Teravus Ovares (Dan Olivares)
b997174d08
* Fix attachment cross issues with new borders.
2009-08-31 20:07:33 -04:00
Teravus Ovares (Dan Olivares)
895c612647
* When the RegionCombinerModule is active add an extra set of borders with Infinite distances around the whole AABB of the region
2009-08-31 16:29:27 -04:00
dr scofield (aka dirk husemann)
27b378ca8b
switching Archiver to "new" region module scheme
2009-08-31 17:25:16 +02:00
dr scofield (aka dirk husemann)
3581b9abce
Merge branch 'regionready' into opensim
2009-08-31 15:02:21 +02:00
dr scofield (aka dirk husemann)
3195af39a7
cleaning up RegionReadyModule:
...
- wrong namespace
- converted to "new" region module
2009-08-31 14:59:28 +02:00
Melanie
9e6684661a
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-31 11:58:49 +01:00
Melanie
090868ff4a
Change the return value if the compiler to "object" to allow compilers
...
to return dynamic method objects
2009-08-31 11:42:54 +01:00
dr scofield (aka dirk husemann)
5209305615
oops. fixing missing argument.
2009-08-31 12:05:14 +02:00
dr scofield (aka dirk husemann)
86521adb7e
adding log message to vector render to inform about default font being used
2009-08-31 11:35:49 +02:00
dr scofield (aka dirk husemann)
953581698d
- making font name used by VectorRenderModule configurable: can be set
...
via
[VectorRender]
font_name = "Comic Sans MS"
in OpenSim.ini
- adding osSetFontName OSSL function
2009-08-31 10:30:10 +02:00
Jeff Ames
bbef5c344e
Remove typo version of ReplaceableInterface property from RegionCombinerModule.
2009-08-31 14:16:16 +09:00
Melanie
d2eba2cf22
Recreate the shell of the AuthenticationService to squelch Windows build
...
error. WIll be filled in as soon as I figure out the crypto stuff.
2009-08-31 01:03:14 +01:00
Teravus Ovares (Dan Olivares)
9f2f3afe22
* Fixes a teleport issue when teleporting out of a region to a different one.
2009-08-30 02:49:50 -04:00
Teravus Ovares (Dan Olivares)
d4dd179547
* whoops, forgot the other class initializer.
2009-08-30 00:29:43 -04:00
Teravus Ovares (Dan Olivares)
59c8a02a24
* When the RegionCombinerModule is off, make borders have an infinite aabb perpendicular to the cardinal
2009-08-30 00:22:38 -04:00
Teravus Ovares (Dan Olivares)
2f40161f38
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-29 23:50:24 -04:00
Teravus Ovares (Dan Olivares)
efe737b895
Ok, merging the RegionCombinerModule with master.
2009-08-29 23:49:48 -04:00
Teravus Ovares (Dan Olivares)
33f36c9010
* Rename the RegionCombiner Module from PhysicsCombiner
2009-08-29 23:39:27 -04:00
Melanie
07e8907569
Remove another IAuthentificationInterface user
2009-08-30 03:27:09 +01:00
Teravus Ovares (Dan Olivares)
44b7c39c93
* Fix the reason why physical vehicles have a problem in virtual regions.
2009-08-29 21:47:28 -04:00
Teravus Ovares (Dan Olivares)
3ccf3aba89
* Fixes looking up parcel permissions in virtual regions.
2009-08-29 16:24:03 -04:00
Melanie
5b06079a83
Remove a user of the old auth interface
2009-08-29 17:49:58 +01:00
Melanie
dce04df4f2
Redesign the IAuthenticationService interface to use PKI. Sessioning is
...
now in the domain of the presence module where it belongs.
2009-08-29 17:37:41 +01:00
Teravus Ovares (Dan Olivares)
d45f871d8f
* Only lock the Borders when they're being changed, otherwise one avatar's movement could hinder another avatar's movement.
2009-08-29 03:36:41 -04:00
Melanie
1a6b30e092
Add a slow cache cleaner thread. By default, the thread starts a cleanup
...
sweep every 10 minutes. If any texture data is older than 12 hours, it is
regenerated and the memory cache is refreshed. After each decode, the thread
delays for 5 seconds.
2009-08-29 05:54:38 +01:00
Melanie
2a5b9f7740
the beginning of some changes to the decode cache to address concerns about
...
system load. This commit effectively disables expiration.
2009-08-29 05:29:54 +01:00
Melanie
4b2e62fd3c
Make the j2kDecodeCache expire after 50 minutes (configurable). Alse allows
...
setting the path for it. This commit introduces NEW DEFAULT BEHAVIOR. To
retain the old behavior (eternal cache) you will need to change your OpenSim.ini
and set the timeout to 0.
2009-08-29 04:35:18 +01:00
Melanie
976cf4284b
Fix up WebFetchInventoryDescendents to really return all data needed,
...
especially the folder version and the subfolders. Fixes inventory search
hang and folders not loading.
2009-08-29 03:26:44 +01:00
Teravus Ovares (Dan Olivares)
9eb8c14e87
* Deal with teleports to other virtual regions in the same scene.
2009-08-28 19:42:28 -04:00
Melanie
22a0dff226
Modify CAPS inventory code. Currently this is not executed
2009-08-28 23:28:32 +01:00
Arthur Valadares
3d6edc04a3
Implements osDrawPolygon, similar to already implemented osDrawFilledPolygon
2009-08-28 17:48:03 -03:00
Teravus Ovares (Dan Olivares)
ac718843d9
* Allow corner prim crossings. Previously this was only on a single cardinal direction
...
* Some leg work in getting avatar teleports into 'virtual regions' moved to the proper region.
2009-08-28 14:45:17 -04:00
Justin Clark-Casey (justincc)
33004b613d
Standardize FlotsamAssetCache header
...
Add mcortez to CONTRIBUTORS
Other minor tidy of CONTRIBUTORS
2009-08-28 18:12:30 +01:00
Justin Clark-Casey (justincc)
18c5dc0953
Try to cache system folders if they aren't already there when one is requested
...
This operation can be performed legitimately on standalones without a logged in user
2009-08-28 17:19:45 +01:00
Justin Clark-Casey (justincc)
7ff4c2e50b
Pull out distinct cache system folders and drop cache methods in InventoryCache
2009-08-28 17:07:17 +01:00
Justin Clark-Casey (justincc)
7f8df4242b
Correct build break
2009-08-28 12:58:10 +01:00
Justin Clark-Casey (justincc)
d649194be3
minor: formatting and comments
2009-08-28 12:52:40 +01:00
Justin Clark-Casey (justincc)
cf58c0ab08
minor: remove some commented out iar test code
2009-08-28 12:01:21 +01:00
Teravus Ovares (Dan Olivares)
65dda8a795
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-27 19:36:52 -04:00
Justin Clark-Casey (justincc)
d704e62b39
Remove OpenSim.ini comments from the top of FlotsamAssetCache.cs to avoid duplication and divergence with config-include/FlotsamCache.ini.example
2009-08-27 21:49:32 +01:00
Justin Clark-Casey (justincc)
40fbdaaac4
Apply http://opensimulator.org/mantis/view.php?id=3829
...
Fix file access violation on Flotsam cache
Thanks mcortez
2009-08-27 21:25:16 +01:00
Teravus Ovares (Dan Olivares)
6f077d5e5f
* Another attempt at fixing the random spurious test error.
...
* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that.
2009-08-26 21:05:46 -04:00
Teravus Ovares (Dan Olivares)
54e05a083d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-26 11:48:05 -04:00
Melanie
8a9d168928
Add try/catch around EQ request processing
...
Fixes Mantis #4061
2009-08-26 14:46:10 +01:00
Jeff Ames
cf2d1b5c10
Add copy constructor to PhysicsVector.
2009-08-26 14:28:54 +09:00
Jeff Ames
02f937b0dc
Fix some compile warnings.
2009-08-26 14:02:52 +09:00
Jeff Ames
256624566f
Formatting cleanup, minor refactoring.
2009-08-26 14:02:01 +09:00
Teravus Ovares (Dan Olivares)
5f794d3e59
A slightly modified version of
...
http://opensimulator.org/mantis/view.php?id=4040 by jhurliman. The patch didn't match up, so I winged it here. My effort to manually merge the patch seems to make sense, so I'm going to commit it.
2009-08-25 17:36:04 -04:00
Arthur Valadares
efb287f28f
Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using arrow, diamond, round and flat caps.
...
* Made image request safer, if it can't find an image for any reason, draws a square where the image should be and a message alerting the user.
2009-08-25 10:32:45 -03:00
Arthur Valadares
9c9fa51b0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
2009-08-25 10:28:22 -03:00
Diva Canto
cfd9cf7b18
Closed the web request and stream in SynchronousRestSessionObjectPoster -- maybe this is the cause of some timeouts seen in some monos?
2009-08-25 06:17:36 -07:00
Melanie
1e4238af92
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-22 20:18:56 +01:00
Melanie
a22b12ecd4
Change prompt handling in console. No user changes
2009-08-22 20:18:24 +01:00
Diva Canto
71f2d8391b
Moved a debug message.
2009-08-22 10:30:27 -07:00
Diva Canto
751c2000cc
Changed the namespace of old InventoryServiceBase amd AuthedSessionCache.
2009-08-22 10:30:04 -07:00
Diva Canto
b03eeeb9f6
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044 . Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
...
* Removed left-overs from AssetInventoryServer.
2009-08-22 10:24:26 -07:00
Diva Canto
8ef758d826
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-22 09:04:25 -07:00
Diva Canto
75021b5309
Moved AuthedSessionCache to where it is used -- Grid/InventoryServer.
2009-08-22 09:03:59 -07:00
Arthur Valadares
7923fd29a0
Adds osDrawPolygon to OSSL. Works a little different then other OS Drawing functions, this one has no start and end point, but a number of points that will form the desired polygon. Only FilledPolygon implemented so far.
...
* Also added some LSL transparent type conversion, as it's done in LSL scripting (string to integer, float to string, etc)
2009-08-21 21:12:22 -03:00
Arthur Valadares
173701dd63
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-21 17:52:25 -03:00
Arthur Valadares
604ef5ba79
Fix issue where conversion of temporary boolean variable fails on MySQL
2009-08-21 17:48:45 -03:00
Diva Canto
f9ee8be2bc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-21 11:01:23 -07:00
Diva Canto
3318652723
Added a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObjectRequester so that it also understands PUTs.
2009-08-21 11:00:45 -07:00
Teravus Ovares (Dan Olivares)
e1b38ff001
* It turns out that Physics heightmap values were being stored in managed memory in _heightmap and using multiple heightmaps caused them all to overwrite each other and the last one was the heightmap for all of the regions. This fixes that. It also reduces the terrain resolution to half.
2009-08-21 13:22:49 -04:00
Melanie
de3cca6061
Fix Messaging server so -xmlfile actually works
2009-08-21 17:00:18 +01:00
Melanie
7daf6dbbd3
Add -xmlfile= option to UGM, to let the files be outside bin if desired
2009-08-21 11:35:40 +01:00
Jeff Ames
158ad39df0
Add copyright header. Formatting cleanup.
2009-08-21 15:47:55 +09:00
Diva Canto
31e7e1b5f9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 22:37:06 -07:00
Diva Canto
e4f64dd714
Made HandleFetchInventoryDescendents async, so that the client thread doesn't wait for the download of the entire inventory.
2009-08-20 22:36:47 -07:00
Adam Frisby
bd7757de22
* oops. Mistake with value return.
2009-08-21 15:15:15 +10:00
Adam Frisby
f7c5eca978
* Moves NPC Creation across AppDomains to prevent a major perfomance issue.
2009-08-21 15:12:50 +10:00
Diva Canto
9e64427262
Putting the inventory packets back to ThrottleOutPacketType.Asset, because that didn't work.
2009-08-20 21:56:06 -07:00
Diva Canto
922007443e
Changed most of inventory packets to LowPriority, to see if that helps with freezing on searching large inventories.
2009-08-20 21:36:57 -07:00
Adam Frisby
98da8e9b16
* Make cache, actually cache.
2009-08-21 14:20:05 +10:00
Adam Frisby
29e2067ec3
* Implements a cache in NPCModule for Appearance.
2009-08-21 14:10:21 +10:00
Adam Frisby
25dbf16cfb
* Once more into the breach!
2009-08-21 13:44:20 +10:00
Adam Frisby
d4600eec4d
* Attempting to diagnose a connection bug.
2009-08-21 13:35:13 +10:00
Teravus Ovares (Dan Olivares)
64dcb71c14
* Fixes Terrain issues with combined regions.
2009-08-20 23:26:40 -04:00
Teravus Ovares (Dan Olivares)
c9b52cd0b6
* Adds PhysicsCombiner Module
...
* May rename this later
2009-08-20 23:25:40 -04:00
Adam Frisby
bce98f9670
* Fixing an issue with NPC's and Circuit Codes.
2009-08-21 13:12:51 +10:00
Adam Frisby
7ef3e5f41c
* Protip: Declare publically accessible functions, as public functions.
2009-08-21 11:43:45 +10:00
Adam Frisby
c7e140171e
* Addendum to previous
2009-08-21 11:35:19 +10:00
Adam Frisby
1740fd60b3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-21 11:15:48 +10:00
Adam Frisby
01f394d203
* Fleshes more of NPCModule out.
...
* Implements some OSSL commands:
key osNpcCreate(string user, string name, vector position, key cloneFrom);
void osNpcMoveTo(key npc, vector position);
void osNpcSay(key npc, string message);
void osNpcRemove(key npc);
* Untested. Requires ThreatLevel.High.
2009-08-21 11:14:55 +10:00
Melanie
ea32600b8b
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-21 00:26:49 +01:00
Teravus Ovares (Dan Olivares)
181b992b4a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-20 19:25:52 -04:00
Melanie
70c870972a
Fix the user and password defaults int he remote console setup
2009-08-21 00:25:50 +01:00
Teravus Ovares (Dan Olivares)
b8d7663f54
* Deal with git thinking that file was changed even though it wasn't and it's blocking a pull
2009-08-20 19:25:37 -04:00
Teravus Ovares (Dan Olivares)
66c40dd3de
* Switch border cross tests over to the new Border class.
...
* Use List<Border> for each cardinal to allow for irregular regions.
2009-08-20 19:24:31 -04:00
Diva Canto
a3d895908f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 16:19:02 -07:00
Diva Canto
118f710a79
Fixed a missing field in SendBulkInventoryFolderUpdate.
2009-08-20 16:18:32 -07:00
Adam Frisby
e83b00a3df
* Implements a bunch of stuff in NPCModule
2009-08-21 08:51:43 +10:00
Melanie
b23160a871
Remove the AssetInventory server from core. It has fallen behind both
...
upstream and the reference implementation to the point where it is no
longer usable. It has no known users, and sinnce it doesn't work anymore,
it is safe to assume that no one has used it in a long time.
2009-08-20 21:45:49 +01:00
Melanie
297393f349
Remove a load-order dependency in inventory transfer that was biting
...
Windows users
2009-08-20 21:05:00 +01:00
Melanie
4c8bcd2ff6
Add some output (at DEBUG level) to the message transfer module to aid
...
in tracking down an initialization failure.
2009-08-20 20:19:08 +01:00
John Hurliman
ae2ceda479
* Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a valid TextureEntry. About half the time update_avatar_appearance calls are made, the TextureEntry is empty
2009-08-20 10:32:38 -07:00
Diva Canto
1604c9d19e
One more place fixed for setting the inventory folder owner. Thanks jhurliman.
2009-08-20 10:14:53 -07:00
Diva Canto
948c7ea20b
Commented T021_TestCrossToNewRegion because (1) it can fail on panda, and (2) it is not a meaningful representation of region crossing.
2009-08-19 18:08:20 -07:00
Diva Canto
a3db2936f7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 17:36:34 -07:00
Diva Canto
6e35ddb0e9
Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in SQlite. Fixes most grief in
...
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 17:35:42 -07:00
Kunnis
b1853d9f26
Fixing a spot I missed in assets. Switching Grid to the new naming schema with Store/Get
2009-08-19 23:46:25 +01:00
Kunnis
f1287cc7af
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
2009-08-19 23:45:22 +01:00
Diva Canto
c295354ea0
Fixes GetRootFolder for normal standalone, which was being incorrectly redirected to the wrong object. Probably fixes most grief in
...
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 16:15:04 -07:00
Diva Canto
51e487a172
Makes the inventory connectors fully compatible with the old Grid.InventoryServer.
...
WARNING: interacting with the old server is _much_ slower than interacting with the new one. Grids with the old server will not see any improvements on crossings and TPs, because inventory needs to be fetched from it in its entirety.
2009-08-19 12:02:57 -07:00
Teravus Ovares (Dan Olivares)
289439c832
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-19 14:43:18 -04:00
Teravus Ovares (Dan Olivares)
de543002aa
Add Border (a virtual border management class)
...
Move Cardinals to it's own file.
2009-08-19 14:43:03 -04:00
Diva Canto
d519f1885f
Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently).
2009-08-19 10:56:08 -07:00
Diva Canto
4382f28efc
Async purge so that the client thread doesn't wait.
2009-08-19 00:33:02 -07:00
Diva Canto
4818d11b9d
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 00:31:51 -07:00
Diva Canto
c5af39239f
A better purge of trash folder.
2009-08-19 00:13:51 -07:00
Diva Canto
e5f33e7505
GetFolderItems implemented. It's not being called, but it might.
2009-08-18 22:36:03 -07:00
Diva Canto
124f66bfc2
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
2009-08-18 22:17:47 -07:00
Melanie
2111c66f89
Graft the REST console onto the message server as well. What a dirty hack!
...
Works the same as the others.
2009-08-19 05:40:23 +01:00
Melanie
dd0234f500
Graft the REST console onto the grid server. Same procedure as with
...
the user server.
2009-08-19 05:15:25 +01:00
Melanie
c5bbcb04e0
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-19 04:40:57 +01:00
Melanie
99c7a43ffd
Add rest console support to the user server. Will ask new questions at
...
startup. To use, run it normally once, answering the questions, then
run again with -console=rest.
Also now supports -console=basic for a console that reads stdin
2009-08-19 04:39:02 +01:00
Jeff Lee
32cc00ec7b
osGetLinkPrimitiveParams fix
2009-08-18 20:05:27 -07:00
dahlia
465d1095dd
Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user's viewer network throttle settings
2009-08-18 17:06:14 -07:00
Teravus Ovares (Dan Olivares)
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
Teravus Ovares (Dan Olivares)
c54cb59a71
* Some Physics Scene Changes to prepare for larger regions
2009-08-18 11:05:07 -04:00
Diva Canto
d95d3b949b
Fixes mantis #4020 ( http://opensimulator.org/mantis/view.php?id=4020 )
2009-08-18 07:05:22 -07:00
Diva Canto
89cd8a99ed
Commented 2 tests in ScenePresenceTests, one because things were being done in the wrong order, and the other because it NEEDS the inventory service set up. Test-writers, please please please do the scene setup properly EVERYWHERE. It's close to impossible to rely on tests that don't setup resource service references!
2009-08-17 18:52:10 -07:00
Diva Canto
806f48d81a
Added one conditional missing on login, for creating inventory if it doesn't exist already. This hopefully fixes the master avatar problems on standalone.
2009-08-17 17:00:27 -07:00
Diva Canto
d7aa622050
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 15:28:16 -07:00
Diva Canto
df889855ec
Commented out one IAR test, because it's failing and needs attention from justincc or arthursv. I think the mock inventory service needs a little bit more beef.
2009-08-17 15:16:21 -07:00
Diva Canto
3a3f9d5abb
Added some padding to the remote inventory connector so that it tries to operate with the old Grid.InventoryServer.exe. Untested, but it should work -- slow.
2009-08-17 14:14:22 -07:00
Melanie
9ad3e72ae1
Did I say that i don't like git? Remove some stuff that shouldn't have
...
gone in.
2009-08-17 22:06:51 +01:00
Diva Canto
59b4cf2d5b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 13:27:22 -07:00
Justin Clark-Casey (justincc)
0d7bcee560
no-op to poke panda
2009-08-17 20:25:14 +01:00
Justin Clark-Casey (justincc)
4a992388e3
Apply http://opensimulator.org/mantis/view.php?id=4016
...
Make previously hidden cookies available to code
Thanks jhurliman
2009-08-17 20:02:42 +01:00
Justin Clark-Casey (justincc)
eb78ac343e
Apply http://opensimulator.org/mantis/view.php?id=3538
...
Add ability to silence IRC relay of region joins and quits from certain users
This is useful for admins who wish to remain hidden, or service bots.
Thanks RemedyTomm
2009-08-17 19:48:32 +01:00
Adam Frisby
95bb22f883
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:59:05 +10:00
Adam Frisby
30c4aa55e6
Added additional configuration options for MRM Security. See OpenSim.ini.example under the [MRM] section.
2009-08-18 00:58:42 +10:00
Teravus Ovares (Dan Olivares)
f34e89f385
* More Test tweaking to get down to the root cause of the test wierdness
2009-08-17 10:28:58 -04:00
Adam Frisby
58d9d6026e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:23:27 +10:00
Adam Frisby
8c101d24df
* Implementing a bunch of Unimplemented MRM stubs.
2009-08-18 00:23:02 +10:00
Diva Canto
94cd4c136c
Bumping the interface number down again, because this *may* not be a breaking change with older sims.
2009-08-17 06:41:26 -07:00