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
fa8a94577a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-17 05:55:38 -07:00
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
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
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
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
b05539e7cf
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-17 05:01:23 +01:00
002940dd5d
Filling in the blanks: The "meat" of the REST console
2009-08-17 05:00:30 +01:00
052c51f90f
Bumped up grid services interface number.
2009-08-16 20:38:30 -07:00
67a629081e
uh. how about *really* removing it, and not just write a comment above, hey diva?
2009-08-16 19:54:49 -07:00
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
50056871b8
IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld UUID.
2009-08-16 19:35:14 -07:00
550d0e434f
Removing the conditional for assetID=Zero upon rezzing attachments on login.
2009-08-16 19:21:19 -07:00
82c888fc6c
Add copyright headers. Formatting cleanup. Fix a compiler warning.
2009-08-17 10:29:06 +09:00
5d47e08dad
Removed some debug messages
2009-08-16 17:11:20 -07:00
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
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
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
5dde4a4cfa
* More improvements to BasicAssetTest.cs
2009-08-16 14:26:43 -04:00
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
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
23d478f2fa
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-16 13:35:44 -04:00
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00
ad02aefaee
Fix argument index in log4net call. ( fixes #4003 )
2009-08-17 01:46:00 +09:00
e5b94346b6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-17 02:25:24 +10:00
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
acc14c472d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-16 12:15:14 -04:00
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
4eeab4097a
* minor: comments
2009-08-16 12:10:06 -04:00
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
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
c2be3edd2d
* Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of IAvatar.cs
2009-08-16 21:49:53 +10:00
b28e826541
* Implements ISecurityCredential on all uses of SOPObject.cs except Avatar Attachments.
2009-08-16 21:41:57 +10:00
adae13cd18
* [MRM] Added permission checks to MRM Events (ie, requires edit permission to bind to OnTouch)
2009-08-16 21:36:33 +10:00
8621dc405e
* Fixes potential NulRef in MRM Security Checks.
2009-08-16 21:23:39 +10:00
aea4d7c63b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 21:21:38 +10:00
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
2b630470b0
Add copyright headers. Formatting cleanup.
2009-08-16 17:30:13 +09:00
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
a42569d896
Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet Handler - ref mantis #4010
2009-08-16 15:06:06 +09:00
710a15845c
Merge branch 'master' into inventory-connector
2009-08-15 15:08:04 -07:00
19e45466f2
Changed one word in a comment
2009-08-15 14:57:24 -07:00
973be65945
Merge branch 'master' of ../opensim-diva/ into inventory-connector
2009-08-15 19:00:56 +01:00
8b6d79aa3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 03:50:12 +10:00
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
1bbf06405c
Changed FromAssetID to FromItemID
2009-08-15 09:36:45 -07:00
dd8b9d5810
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-15 08:21:15 -07:00
ddac88da6a
* whoops, missing a /
2009-08-15 00:29:34 -04:00
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
95be3eccd2
* minor: comments
...
* also re-trigger panda
2009-08-15 00:01:58 -04:00
f208628667
* minor : Comments
...
* Also re-trigger Panda.
2009-08-14 21:37:25 -04:00
2f61fb0243
* minor : comments
...
* also re-trigger panda
2009-08-14 21:19:04 -04:00
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
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
e17a2331a0
* Re-enable TestLoadIarV0_1ExistingUsers()
2009-08-14 20:38:56 +01:00
ff28ecee1b
Re-enable TestSaveIarV0_1()
...
Implement more parts of TestAssetService
2009-08-14 20:07:13 +01:00
3e94eecc5c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-14 20:00:24 +01:00
a668a5b0d3
Add standard doc and standard doc formatting to IAssetService
2009-08-14 19:59:42 +01:00
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
bb513c1d88
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
2009-08-14 11:32:25 -07:00
7554641703
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 14:16:02 -04:00
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
957962b482
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
2009-08-14 19:06:24 +01:00
31820b0026
minor formatting adjustments
2009-08-14 18:36:09 +01:00
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07:00
c18f7560d9
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-14 18:15:25 +01:00
70d7c97e94
Doing session lookup in the right way.
2009-08-14 09:57:18 -07:00
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
a851b68333
Remove one more sponsor reference
2009-08-14 14:27:56 +01:00
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
6ece8d86e0
Deal with possible race in TestAddNeighborRegion in ScenePresenceTests
2009-08-13 23:06:29 -04:00
02f55ff9bd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 22:12:57 -04:00
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
21b5ebdc1f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 19:11:38 -07:00
7a761560c6
* Add AgentCircuitManager tests for adding, removing, changing circuit code, and authentication.
2009-08-13 21:01:39 -04:00
ded76723eb
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 17:45:17 -07:00
73b0cf492d
Add some extra info to script load messages
2009-08-14 01:35:14 +01:00
034c9cf606
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
2009-08-13 17:34:15 -07:00
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
5246dc33dc
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
2009-08-13 14:10:12 -07:00
6b9cc6c48d
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
2009-08-13 11:30:29 -07:00
9bcca3dc95
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 12:39:46 -04:00
5b325f1f54
* minor: comments
2009-08-13 12:39:33 -04:00
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
3669115d60
Some small fixes
2009-08-13 13:25:33 +01:00
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
94dfe2a20d
Add a profile module interface for the client view to use
2009-08-13 13:05:27 +01:00
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
b0292d59a5
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-12 20:40:49 -07:00
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
0a85d1d767
minor:comments
2009-08-12 23:34:12 -04:00
18634e9dd8
minor: comments
2009-08-12 23:18:00 -04:00
6c1adbf9a5
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-12 22:55:21 -04:00
b47e405420
* minor: Comments
2009-08-12 22:54:57 -04:00
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09:00
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
b3b506cba2
Better test for dropping inventory cache and writing out debug messages.
2009-08-12 09:31:33 -07:00
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
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
41839efcc5
Some more hammering on the head of the obsolete rest inventory handlers, just to make this work.
2009-08-11 14:52:17 -07:00
bd7ff803fe
Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST.
2009-08-11 14:31:45 -07:00
dae9a111aa
Added new operations to mock inventory service in tests.
2009-08-11 13:16:53 -07:00
bf3f376b10
Fixed test for detecting when user is no longer in sim.
2009-08-11 12:55:46 -07:00
08544e576d
Disabling the remote call for the time being, so that I can test it on a grid before making it live.
2009-08-11 12:48:19 -07:00
764ec7ba0a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-11 12:31:02 -07:00
e3dbd0e049
Added http handlers for the two new inventory operations.
2009-08-11 12:30:28 -07:00
fdd0ce68b3
Do new inventory module setup, which is why the test was failing (not the original race condition, hopefully!)
...
Still always catching the NRE for now pending analysis
2009-08-11 20:09:35 +01:00
dc897b2288
Merged with origin, and resolved one conflict in LoginServiceTests.cs
2009-08-11 10:51:49 -07:00
263f32a493
Improved test for system folders. Removed log messages.
2009-08-11 10:42:44 -07:00
31419a70ce
System folders inventory cache added to OUT inventory modules. This tracks agents in and out of *sims* in order to fetch/drop their system folders from the cache. Also added region-side support for fetching the system folders from the inventory service. Nothing of this is called yet.
2009-08-11 10:30:03 -07:00
2dbdb7e036
Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on the NRE for now
...
Add temporarily logging for diagnosis
2009-08-11 17:49:52 +01:00
655438a59d
Apply http://opensimulator.org/mantis/view.php?id=1448
...
Store and retrieve user profile url at runtime
Not yet persisted
Thanks Fly-Man
2009-08-11 17:29:15 +01:00
a52b5e46c0
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-11 17:10:22 +01:00
bb64906a9c
Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
...
git log -n 1 --pretty="format:%h: %ci" > bin/.version
This command can also be run manually to create the bin/.version file.
This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H
The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
f9b60f5c34
Disable test again. Ho hum.
2009-08-11 17:05:01 +01:00
39c9f681ab
re-enable just TestReplicateArchivePathToUserInventory() for now to find out if the race condition has been vanquished
2009-08-11 16:55:45 +01:00
226c082ed4
Establish CachedUserInfo.OnInventoryReceived event so that region/test inventory code can be written with the async inventory fetch
2009-08-11 16:45:16 +01:00
2054093908
Added some needed comments to SceneSetupHelper (actually just retriggering panda)
2009-08-11 12:24:41 -03:00
18aa2ea0c5
* Improves SceneSetupHelper to allow the tester to choose a real or mock, inventory and asset, service modules. The boolean startServices was replaced with realServices string. If the string contains the word asset, it will start a real asset module, if it contains inventory, it starts a real inventory. Otherwise, it use mock (NullPlugin-like) objects, for tests that don't really need functionality.
...
* SetupScene is now actually sharing the asset and inventory modules if the tester wishes to have multiple regions connected. To link regions, just start SetupScene with the same CommunicationManager for all scenes. SceneSetupHelper will hold a static reference to the modules and won't initialize them again, just run the scenes through the modules AddRegion, RegionLoaded and PostInitialize.
* With the recent changes, both asset and inventory (and in the future, user) services should always be asked from the scene, not instantiated alone. The tests should reflect this new behavior and always start a scene.
2009-08-11 12:07:54 -03:00
cdcbc48534
Added two new methods to IIventoryService -- GetFolderForType and GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet.
2009-08-10 20:31:51 -07:00
9f95ec4998
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-10 16:02:33 -07:00
0c47f8e7ab
Changed RequestRootFolder to GetRootFolder
2009-08-10 16:02:09 -07:00
eba23048ca
Replace the Replaceable modules name
2009-08-10 23:08:22 +01:00
17cc9b9857
Last piece of cleaning up old inventory. Old IInventoryServices and ISecureInventoryService interfaces removed.
2009-08-10 12:44:15 -07:00
34d0f119cb
Conditional to prevent a null ref in tests. The tests may still not pass.
2009-08-10 11:48:30 -07:00
43b7e67288
Et voila! - Old inventory code removed.
2009-08-10 10:58:43 -07:00
5d2a157e64
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
2009-08-10 10:48:21 -07:00
d12c173a70
AssetCache.addin.xml seems to be historical junk too. Removed.
2009-08-10 09:01:07 -07:00
da82fe0409
* Fix test failure by setting up MainConsole.Instance in SceneSetupHelpers.SetupScene()
2009-08-10 16:55:53 +01:00
3e247a8eaa
Minor: formatting cleanup.
2009-08-11 00:32:59 +09:00
8863092f7c
Split BasicPhysics classes into separate files.
2009-08-11 00:32:59 +09:00
0d8284c7a1
Removed IAssetCache.
...
WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 08:14:57 -07:00
7e13e96f56
Removed IAssetServer.
2009-08-10 08:01:13 -07:00
024755d8b7
Slowly working my way towards the elimination of IAssetServer and IAssetCache.
2009-08-10 07:13:13 -07:00
a50904a68b
More clean up from asset cache legacy. None of these classes are used anymore.
2009-08-10 06:41:03 -07:00
c7484dc739
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-10 06:35:38 -07:00
ad016ba87c
Added some help instructions to the new RegionInfo region setup process; mainly to point out 'yes you can input information here.' since it seems to elude some users.
2009-08-10 19:06:09 +10:00
3f06fb3601
Removing unused files, legacy from old asset "cache".
2009-08-09 17:46:37 -07:00
239a14265e
Stub out the Profile and Presence services
2009-08-10 00:17:54 +01:00
430cc0a24a
Add "show digest <id>" console commdn to the ROBUST asset handler
...
R.O.B.U.S.T.# show digest b8d3965a-ad78-bf43-699b-bff8eca6c975
Name: Terrain Dirt
Description:
Type: 0
Content-type: image/jp2
0000: FF-4F-FF-51-00-2F-00-00-00-00-00-80-00-00-00-80
2009-08-09 23:22:59 +01:00
a5a5e44246
Re-removing 2 lines that got added back on Melanie's commits. git hickup.
2009-08-09 15:17:42 -07:00
474f58faf5
Finish the renaming and mae things compile again
2009-08-09 22:25:15 +01:00
6ba89bef61
More renames
2009-08-09 22:09:10 +01:00
11d72f270d
Rename UserData to UserAccount data
2009-08-09 21:53:11 +01:00
6a6dd66129
More removal of HG2 code, this time authentication module and handlers.
2009-08-09 14:21:47 -07:00
04aca66330
Removed HGInventory out of core. This is part of HG2, which it now being developed outside.
2009-08-09 13:59:26 -07:00
8b9f8709aa
* FreeContext may be a bit too buggy for my tastes in some environments. * Commenting it for the moment.
2009-08-08 14:14:52 -04:00
bc6ec3b564
Formatting cleanup.
2009-08-09 00:43:13 +09:00
e88903f481
* Fix one physics crash for regions larger then 512mx512m
2009-08-08 10:38:53 -04:00
b5727a1d77
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-08 00:10:38 -04:00
Diva Canto