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
Diva Canto
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07: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
Diva Canto
21b5ebdc1f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 19:11:38 -07: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
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
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
Jeff Ames
eedb155502
Thanks jonc for a patch to ignore some Visual Studio and generated ini files.
2009-08-12 12:32:49 +09:00
Teravus Ovares (Dan Olivares)
2e9fc9a22b
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-11 20:32:05 -04:00
Teravus Ovares (Dan Olivares)
094c296fb4
Try something to help the tests complete.
2009-08-11 20:29:52 -04: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
Diva Canto
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
Diva Canto
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
Diva Canto
dae9a111aa
Added new operations to mock inventory service in tests.
2009-08-11 13:16:53 -07:00
Diva Canto
bf3f376b10
Fixed test for detecting when user is no longer in sim.
2009-08-11 12:55:46 -07:00
Diva Canto
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
Diva Canto
764ec7ba0a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-11 12:31:02 -07:00
Diva Canto
e3dbd0e049
Added http handlers for the two new inventory operations.
2009-08-11 12:30:28 -07:00
Justin Clark-Casey (justincc)
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
Diva Canto
dc897b2288
Merged with origin, and resolved one conflict in LoginServiceTests.cs
2009-08-11 10:51:49 -07:00
Diva Canto
263f32a493
Improved test for system folders. Removed log messages.
2009-08-11 10:42:44 -07:00
Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
a52b5e46c0
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-11 17:10:22 +01:00
Chris Down
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
Justin Clark-Casey (justincc)
f9b60f5c34
Disable test again. Ho hum.
2009-08-11 17:05:01 +01:00