Teravus Ovares (Dan Olivares)
fc3e24af9c
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:08:59 -04:00
Teravus Ovares (Dan Olivares)
74d63d4da2
Modify README.txt to trigger new build /again/
2010-05-02 20:08:19 -04:00
Teravus Ovares (Dan Olivares)
18f6714451
Modify README.txt to trigger new build
2010-05-02 19:56:40 -04:00
Melanie Thielker
7e74291176
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-02 23:36:00 +01:00
Diva Canto
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
Diva Canto
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
Diva Canto
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
Justin Clark-Casey (justincc)
648999dd3b
add operation to "nant distbin" to copy StandaloneCommon.ini.example -> StandaloneCommon.ini
2010-04-30 22:37:23 +01:00
Melanie
0c2ab54d41
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 21:13:31 +01:00
Justin Clark-Casey (justincc)
f1164161b3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 22:22:40 +01:00
Justin Clark-Casey (justincc)
f3662e3d15
minor: eliminate more debug Console.WriteLines, convert one to logging instead
2010-04-30 22:22:03 +01:00
Melanie Thielker
d0accc0732
Allow retrieval if admin users in scope mode
2010-04-30 21:13:03 +01:00
Melanie Thielker
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
Melanie
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
Diva Canto
5fda81e6bb
* XInventory fairly tested, including for HG. Almost ready to switch.
...
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
Melanie
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
Justin Clark-Casey (justincc)
d921329799
take out some debug logging in the sqlite db adaptor
2010-04-30 18:18:21 +01:00
Justin Clark-Casey (justincc)
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
Justin Clark-Casey (justincc)
cc67de5b86
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
...
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
Justin Clark-Casey (justincc)
60dbc3c6ce
Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux.
...
I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library)
Unfortunately, I need to shaft somebody (as it were)
2010-04-30 17:01:50 +01:00
Melanie
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
Melanie
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
Melanie
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
Diva Canto
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
Diva Canto
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
Melanie
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
Diva Canto
2c595227b0
Commented verbose debug messages from XInventory handler.
2010-04-28 07:41:16 -07:00
AlexRa
be1141f0f7
Refactoring in Migration.cs: "using()" instead of explicit Dispose()
...
This ensures that 'cmd' gets disposed on errors
2010-04-28 13:40:35 +03:00
AlexRa
b49e9eff56
Fixed comments in Migration.cs: wrong argument order (no change to code)
2010-04-28 13:11:42 +03:00
unknown
aa56953411
Compiler.cs contained method GetCompilerOutput which, apparently,
...
was not used, but exactly the same path was calculated inline.
This patch does some minor refactoring by replacing inline path
calculation with GetCompilerOutput. This doesn't actually affect anything,
just minor prettifying of the code
2010-04-28 12:52:36 +03:00
AlexRa
8b75302a1e
Just a bit of spellchecking in the comments
2010-04-28 12:21:39 +03:00
unknown
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
unknown
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
AlexRa
423ff3b94b
Removed unused var from InventoryService.cs (-1 warning)
2010-04-28 11:47:03 +03:00
AlexRa
b9c6ee6eb2
removed from git *.VisualState.xml (automatically created by NUnit)
2010-04-28 11:41:39 +03:00
AlexRa
0718748ea4
Removed from git .../obj directories (created by VStudio)
2010-04-28 11:41:22 +03:00
Diva Canto
c54bc5094d
Putting it back to protected; Melanie doesn't like it to be public.
2010-04-27 18:52:15 -07:00
Diva Canto
044c1cf5f6
Changed GetToken from protected to public. This is not exposed at the interface.
2010-04-27 18:37:34 -07:00
John Hurliman
e838776920
* Thanks cmickeyb, for a patch that sanity checks if the response from m_Database.GetAsset(assetID) is null in AssetService.cs
2010-04-27 17:13:54 -07:00
John Hurliman
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
justincc
6d05ea2a75
update Mono.Data.Sqlite.dll to the one that shipped with Mono 2.6.3, which is the one known to work in Windows
...
Thanks for the initial library inclusion, Diva. I had it all queued up on my windows test machine but forgot to add it!
2010-04-27 20:44:04 +01:00
Diva Canto
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
Melanie
a92ca3c2c9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-27 03:49:25 +01:00
Diva Canto
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
Melanie
1e743eab6d
Allow a client to pass a scope id to log into in the login XML / LLSD
2010-04-27 03:48:49 +01:00
Melanie
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
Melanie
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
Diva Canto
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
Diva Canto
2686573b1c
Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
2010-04-26 15:03:47 -07:00
Diva Canto
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00