ea32600b8b
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-21 00:26:49 +01:00
181b992b4a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-20 19:25:52 -04:00
70c870972a
Fix the user and password defaults int he remote console setup
2009-08-21 00:25:50 +01:00
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
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
a3d895908f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-20 16:19:02 -07:00
118f710a79
Fixed a missing field in SendBulkInventoryFolderUpdate.
2009-08-20 16:18:32 -07:00
e83b00a3df
* Implements a bunch of stuff in NPCModule
2009-08-21 08:51:43 +10:00
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
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
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
1604c9d19e
One more place fixed for setting the inventory folder owner. Thanks jhurliman.
2009-08-20 10:14:53 -07:00
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
a3db2936f7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 17:36:34 -07: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
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
f1287cc7af
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
2009-08-19 23:45:22 +01:00
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
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
289439c832
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-19 14:43:18 -04:00
de543002aa
Add Border (a virtual border management class)
...
Move Cardinals to it's own file.
2009-08-19 14:43:03 -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
4818d11b9d
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-19 00:31:51 -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
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
dd0234f500
Graft the REST console onto the grid server. Same procedure as with
...
the user server.
2009-08-19 05:15:25 +01:00
c5bbcb04e0
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-19 04:40:57 +01:00
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
32cc00ec7b
osGetLinkPrimitiveParams fix
2009-08-18 20:05:27 -07:00
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
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
c54cb59a71
* Some Physics Scene Changes to prepare for larger regions
2009-08-18 11:05:07 -04:00
d95d3b949b
Fixes mantis #4020 ( http://opensimulator.org/mantis/view.php?id=4020 )
2009-08-18 07:05:22 -07:00
cd3b7bcb03
* Update HTTP Server with jhurliman's longheader fix. Changes 1024 with 4096.
2009-08-18 01:19:01 -04:00
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
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
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
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
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
59b4cf2d5b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 13:27:22 -07:00
0d7bcee560
no-op to poke panda
2009-08-17 20:25:14 +01:00
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
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
95bb22f883
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:59:05 +10:00
30c4aa55e6
Added additional configuration options for MRM Security. See OpenSim.ini.example under the [MRM] section.
2009-08-18 00:58:42 +10:00
Melanie