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
Diva Canto
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
Melanie
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
Melanie
3d7bb7567c
Add the ability to use -console=rest to the region server. User
...
and pass are specified the same way as for the ROBUST server
2009-08-17 09:21:39 +01:00
Melanie
dc0f0f5da8
Limit the scrollback buffer output of the command line client to
...
100 lines (4 screens worth) so things don't scroll endlessly on connect
2009-08-17 08:56:40 +01:00
Melanie
cef16bec6d
Add the OpenSim.ConsoleClient app.
...
Usage: OpenSim.ConsoleClient -h <host> -p <port> -u <user> -P <pass>
host defaults to localhost, port defaults to 8003.
2009-08-17 08:45:20 +01:00
Melanie
b05539e7cf
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-17 05:01:23 +01:00
Melanie
002940dd5d
Filling in the blanks: The "meat" of the REST console
2009-08-17 05:00:30 +01:00
Diva Canto
052c51f90f
Bumped up grid services interface number.
2009-08-16 20:38:30 -07:00
Diva Canto
67a629081e
uh. how about *really* removing it, and not just write a comment above, hey diva?
2009-08-16 19:54:49 -07:00
Diva Canto
87f116ab3a
Remove the call to ResetAttachments upon login. The info in the DB should always have {itemID, assetID}.
2009-08-16 19:51:16 -07:00
Diva Canto
50056871b8
IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld UUID.
2009-08-16 19:35:14 -07:00
Diva Canto
550d0e434f
Removing the conditional for assetID=Zero upon rezzing attachments on login.
2009-08-16 19:21:19 -07:00
Jeff Ames
82c888fc6c
Add copyright headers. Formatting cleanup. Fix a compiler warning.
2009-08-17 10:29:06 +09:00
Diva Canto
5d47e08dad
Removed some debug messages
2009-08-16 17:11:20 -07:00
Diva Canto
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
Teravus Ovares (Dan Olivares)
bf8e07606f
* handle litjson errors for now. We'll remove this when we hear back from http://jira.openmetaverse.org/browse/LIBOMV-675
2009-08-16 17:19:52 -04:00
Kunnis
dd78c250ae
* Added Expression based ignores to the PropertyScrambler, which makes a lot of the tests clearer because I'm not constantly resetting properties.
2009-08-16 14:34:16 -04:00
Kunnis
5dde4a4cfa
* More improvements to BasicAssetTest.cs
2009-08-16 14:26:43 -04:00
Kunnis
d2e5380cb2
* Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra parameter from MySQL/MySQLInventoryData.cs * Fixed a bug in SQLite/SQLiteAssetData.cs that was causing a NRE when updating an asset. * Improved the BasicAssetTest.cs to do full create/update/get testing * Improved the BasicInventoryTest.cs to do full create/update/get of both a folder and an item * Moved the null ref tests to the start of the PropertyCompareConstraint.cs, so that it doesn't throw when passing in a null item
2009-08-16 14:17:29 -04:00
Kunnis
f6251ce810
* Modified SQLite/SQLiteInventoryStore.cs to not throw if the inventory row does not exist, to match the mysql behavior. * Modified SQLite/SQLiteRegionData.cs to only persist temporary items following the same rules mysql uses. * Added another ignore to the inventory test that was missing. * Added a few more ignores to the RegionTest that the first version of my test were missing. * Added ignoring the root Folder ID, which is set by the inventory system. * Added several improvements to the PropertyCompareConstraint: Protection against infinite loops, added IComparable<T> (for UUID) and moved IComparable before the property matching. * Fixed a bug where I was saving the inside of the ignore expression instead of the outside of it.
2009-08-16 14:15:59 -04:00
Kunnis
23d478f2fa
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-16 13:35:44 -04:00
Jeff Ames
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00
Jeff Ames
ad02aefaee
Fix argument index in log4net call. ( fixes #4003 )
2009-08-17 01:46:00 +09:00
Adam Frisby
e5b94346b6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-17 02:25:24 +10:00
Adam Frisby
fa921ec147
* Implements AppDomain Security for MRM Scripts.
...
* Added permissionLevel attribute to [MRM] section in OpenSim.ini. Default is 'Internet', however may be any of the following (case sensitive), FullTrust, SkipVerification, Execution, Nothing, LocalIntranet, Internet, Everything. For previous functionality, set to FullTrust or Execution.
2009-08-17 02:25:00 +10:00
Teravus Ovares (Dan Olivares)
acc14c472d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-16 12:15:14 -04:00
Teravus Ovares (Dan Olivares)
5e391b9f7c
* ShortVersion, another attempt at fixing the test thread death that randomly occurs.
...
* LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.
2009-08-16 12:14:49 -04:00
Teravus Ovares (Dan Olivares)
4eeab4097a
* minor: comments
2009-08-16 12:10:06 -04:00
Diva Canto
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
Adam Frisby
cbd454d692
* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment
...
* Disables 'event not used' warning for IRCClientView; cuts OpenSim total warnings back.
2009-08-16 22:01:18 +10:00
Adam Frisby
c2be3edd2d
* Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of IAvatar.cs
2009-08-16 21:49:53 +10:00
Adam Frisby
b28e826541
* Implements ISecurityCredential on all uses of SOPObject.cs except Avatar Attachments.
2009-08-16 21:41:57 +10:00
Adam Frisby
adae13cd18
* [MRM] Added permission checks to MRM Events (ie, requires edit permission to bind to OnTouch)
2009-08-16 21:36:33 +10:00
Adam Frisby
8621dc405e
* Fixes potential NulRef in MRM Security Checks.
2009-08-16 21:23:39 +10:00
Adam Frisby
aea4d7c63b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 21:21:38 +10:00
Adam Frisby
975c49a399
* [MRM] Implements permission checks on IObject implementations in SOPObject.cs. Does not implement security on IObjectInventory yet.
2009-08-16 21:20:45 +10:00
Jeff Ames
2b630470b0
Add copyright headers. Formatting cleanup.
2009-08-16 17:30:13 +09:00
Jeff Ames
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
Adam Johnson
a42569d896
Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet Handler - ref mantis #4010
2009-08-16 15:06:06 +09:00
Diva Canto
710a15845c
Merge branch 'master' into inventory-connector
2009-08-15 15:08:04 -07:00
Diva Canto
19e45466f2
Changed one word in a comment
2009-08-15 14:57:24 -07:00
Melanie
973be65945
Merge branch 'master' of ../opensim-diva/ into inventory-connector
2009-08-15 19:00:56 +01:00
Adam Frisby
8b6d79aa3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 03:50:12 +10:00
Adam Frisby
9090a90769
* Beginnings of a Security Credential system in MRM. This will eventually lead to trusted execution of untrusted MRMs.
2009-08-16 03:48:16 +10:00
Teravus Ovares (Dan Olivares)
30ce56e721
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-15 13:10:21 -04:00
Teravus Ovares (Dan Olivares)
8000812700
* part one of adding physics combining
2009-08-15 13:10:10 -04:00
Diva Canto
1bbf06405c
Changed FromAssetID to FromItemID
2009-08-15 09:36:45 -07:00
Diva Canto
dd8b9d5810
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-15 08:21:15 -07:00
Teravus Ovares (Dan Olivares)
ddac88da6a
* whoops, missing a /
2009-08-15 00:29:34 -04:00
Teravus Ovares (Dan Olivares)
72c2819c53
* Comment out XEngineTest that doesn't appear to test anything. It just creates a scene named 'My Test' which just happens to be the last scene displayed in the nunit log before it goes boom.
2009-08-15 00:22:18 -04:00
Teravus Ovares (Dan Olivares)
95be3eccd2
* minor: comments
...
* also re-trigger panda
2009-08-15 00:01:58 -04:00
Teravus Ovares (Dan Olivares)
f208628667
* minor : Comments
...
* Also re-trigger Panda.
2009-08-14 21:37:25 -04:00
Teravus Ovares (Dan Olivares)
2f61fb0243
* minor : comments
...
* also re-trigger panda
2009-08-14 21:19:04 -04:00
Teravus Ovares (Dan Olivares)
1b933c9116
* Put the StandaloneTeleportTest in a new thread and call Thread.Join() inside a try/Catch (ThreadAbortException) to try and get around scene code aborting the testing thread. Use a Messenger class to report the results back to the test thread.
2009-08-14 19:12:42 -04:00
Diva Canto
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
Justin Clark-Casey (justincc)
e17a2331a0
* Re-enable TestLoadIarV0_1ExistingUsers()
2009-08-14 20:38:56 +01:00
Justin Clark-Casey (justincc)
ff28ecee1b
Re-enable TestSaveIarV0_1()
...
Implement more parts of TestAssetService
2009-08-14 20:07:13 +01:00
Justin Clark-Casey (justincc)
3e94eecc5c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-14 20:00:24 +01:00
Justin Clark-Casey (justincc)
a668a5b0d3
Add standard doc and standard doc formatting to IAssetService
2009-08-14 19:59:42 +01:00
Diva Canto
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
Diva Canto
bb513c1d88
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
2009-08-14 11:32:25 -07:00
Teravus Ovares (Dan Olivares)
7554641703
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 14:16:02 -04:00
Teravus Ovares (Dan Olivares)
dce81225c5
* allocate the dictionary for AgentCircuitData.ChildrenCapSeeds when creating the circuitdata object to see if it's the cause of a null reference exception in the TestAddNeighbourRegio test
2009-08-14 14:15:49 -04:00
Justin Clark-Casey (justincc)
957962b482
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
2009-08-14 19:06:24 +01:00
Justin Clark-Casey (justincc)
31820b0026
minor formatting adjustments
2009-08-14 18:36:09 +01:00
Diva Canto
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07:00
Kunnis
c18f7560d9
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-14 18:15:25 +01:00
Diva Canto
70d7c97e94
Doing session lookup in the right way.
2009-08-14 09:57:18 -07:00
Diva Canto
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
Melanie
a851b68333
Remove one more sponsor reference
2009-08-14 14:27:56 +01:00
Melanie
7a2a2e68e7
Remove the script sponsor logic because scripts are timing out again.
...
This needs to be looked into. This commit, unfortunately, reinstates
a memory leak in regions that see significant script fluctuation,
e.g. lots of scripted attachments, or script development.
2009-08-14 14:18:56 +01:00
Teravus Ovares (Dan Olivares)
6ece8d86e0
Deal with possible race in TestAddNeighborRegion in ScenePresenceTests
2009-08-13 23:06:29 -04:00
Teravus Ovares (Dan Olivares)
02f55ff9bd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 22:12:57 -04:00
Teravus Ovares (Dan Olivares)
0781ac9a5e
* Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing a thread, a dead thread, and a null Thread
...
* Fix a null thread situation
2009-08-13 22:12:37 -04:00
Diva Canto
21b5ebdc1f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 19:11:38 -07:00
Teravus Ovares (Dan Olivares)
7a761560c6
* Add AgentCircuitManager tests for adding, removing, changing circuit code, and authentication.
2009-08-13 21:01:39 -04:00
Diva Canto
ded76723eb
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 17:45:17 -07:00
Melanie
73b0cf492d
Add some extra info to script load messages
2009-08-14 01:35:14 +01:00
Diva Canto
034c9cf606
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
2009-08-13 17:34:15 -07:00
Teravus Ovares (Dan Olivares)
f5fc5226f8
* Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test.
2009-08-13 18:10:09 -04:00
Diva Canto
5246dc33dc
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
2009-08-13 14:10:12 -07:00
Diva Canto
6b9cc6c48d
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
2009-08-13 11:30:29 -07:00
Teravus Ovares (Dan Olivares)
9bcca3dc95
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 12:39:46 -04:00
Teravus Ovares (Dan Olivares)
5b325f1f54
* minor: comments
2009-08-13 12:39:33 -04:00
Diva Canto
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
Melanie
3669115d60
Some small fixes
2009-08-13 13:25:33 +01:00
Melanie
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
Melanie
94dfe2a20d
Add a profile module interface for the client view to use
2009-08-13 13:05:27 +01:00
Jeff Ames
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
Diva Canto
b0292d59a5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-12 20:40:49 -07:00
Diva Canto
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
Teravus Ovares (Dan Olivares)
0a85d1d767
minor:comments
2009-08-12 23:34:12 -04:00
Teravus Ovares (Dan Olivares)
18634e9dd8
minor: comments
2009-08-12 23:18:00 -04:00
Teravus Ovares (Dan Olivares)
6c1adbf9a5
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-12 22:55:21 -04:00
Teravus Ovares (Dan Olivares)
b47e405420
* minor: Comments
2009-08-12 22:54:57 -04:00
Jeff Ames
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09:00
Diva Canto
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
Diva Canto
b3b506cba2
Better test for dropping inventory cache and writing out debug messages.
2009-08-12 09:31:33 -07:00
dr scofield (aka dirk husemann)
613e6f07fc
change 535cb0efc
so that the default LLSD serialization format is
...
llsd+xml instead of llsd+json --- the latter seems to break existing
bots. this assumes that those bots that want llsd+json will properly
signal that desire, if that is not the case, we need to revisit
this. fixes mantis #3977 .
2009-08-12 14:49:59 +02:00
Diva Canto
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