fc3e24af9c
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:08:59 -04:00
74d63d4da2
Modify README.txt to trigger new build /again/
2010-05-02 20:08:19 -04:00
18f6714451
Modify README.txt to trigger new build
2010-05-02 19:56:40 -04:00
175f3f992a
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-03 01:50:32 +02:00
af0ffb2a5a
Add URL_REQUEST_* script constants
2010-05-03 00:15:55 +01:00
fbd4222533
Last time?
2010-05-03 00:11:12 +01:00
88016b9c2a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 00:10:14 +01:00
02f9b3ac2d
And again
2010-05-03 00:09:47 +01:00
d9910d2a44
test commit
2010-05-03 00:08:28 +01:00
0fa57cac3f
Fix sensor cone for sensing avatars
2010-05-03 00:54:24 +02:00
7e74291176
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-02 23:36:00 +01:00
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
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
5f6e9e6ab9
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-02 08:18:33 -04:00
7ad36d3d75
Adding DebugEvent Trap
...
Adding XMREEvent Trap
trapDebug("Modulename" ,"My data here ", scene);
trapXMRE(int data, string Message, Scene scene);
2010-05-02 08:15:12 -04:00
648999dd3b
add operation to "nant distbin" to copy StandaloneCommon.ini.example -> StandaloneCommon.ini
2010-04-30 22:37:23 +01:00
881fcb7def
Allow retrieval if admin users in scope mode
2010-04-30 23:32:58 +02:00
0c2ab54d41
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 21:13:31 +01:00
f1164161b3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 22:22:40 +01:00
f3662e3d15
minor: eliminate more debug Console.WriteLines, convert one to logging instead
2010-04-30 22:22:03 +01:00
d0accc0732
Allow retrieval if admin users in scope mode
2010-04-30 21:13:03 +01:00
7ae55f6248
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:29 +01:00
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
3e30de7430
Fix linking issue introduced in my earlier commit
2010-04-30 22:35:07 +02:00
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
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
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
d921329799
take out some debug logging in the sqlite db adaptor
2010-04-30 18:18:21 +01:00
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
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
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
486ab82c02
Fix some symbol errors
2010-04-30 12:08:37 +01:00
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
9500ba2ff5
Fix some symbol errors
2010-04-30 12:06:58 +01:00
13960b3b86
Merge branch 'master' into careminster-presence-refactor
2010-04-30 11:49:24 +01:00
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
9c79fd6308
Treat a UserLevel of -1 as an unverified account and refer them to their
...
activation email.
2010-04-30 05:33:45 +01:00
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
f3c21524be
Fix Av jump motion S/W
2010-04-29 19:41:08 -04:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
f06772a088
Merge branch 'careminster' into careminster-presence-refactor
2010-04-29 23:33:20 +01:00
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
5c23b4aa56
Fix vertical attractor
2010-04-29 13:50:11 -04:00
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
Teravus Ovares (Dan Olivares)