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
2c595227b0
Commented verbose debug messages from XInventory handler.
2010-04-28 07:41:16 -07:00
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
b49e9eff56
Fixed comments in Migration.cs: wrong argument order (no change to code)
2010-04-28 13:11:42 +03:00
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
8b75302a1e
Just a bit of spellchecking in the comments
2010-04-28 12:21:39 +03:00
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
423ff3b94b
Removed unused var from InventoryService.cs (-1 warning)
2010-04-28 11:47:03 +03:00
b9c6ee6eb2
removed from git *.VisualState.xml (automatically created by NUnit)
2010-04-28 11:41:39 +03:00
0718748ea4
Removed from git .../obj directories (created by VStudio)
2010-04-28 11:41:22 +03:00
c54bc5094d
Putting it back to protected; Melanie doesn't like it to be public.
2010-04-27 18:52:15 -07:00
044c1cf5f6
Changed GetToken from protected to public. This is not exposed at the interface.
2010-04-27 18:37:34 -07:00
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
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
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
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
8a32ee7dd2
Merge branch 'careminster' into careminster-presence-refactor
2010-04-27 03:58:43 +01:00
89a003c6fc
Merge branch 'master' into careminster-presence-refactor
2010-04-27 03:57:36 +01:00
a92ca3c2c9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-27 03:49:25 +01:00
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
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
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
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
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
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
27b3f23ff3
Remove some usings that stopped compilation
2010-04-24 16:53:47 +02:00
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
15d42d2111
Add instructions for using SQLiteNG to OpenSim.ini and config-include/StandaloneCommon.ini
...
Unfortunately, database settings need to be changed in two places.
2010-04-23 22:06:02 +01:00
847cc4fceb
remove [DatabaseService] section from OpenSim.ini since this is always present in included configuration files
2010-04-23 21:31:08 +01:00
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
6e99e5b47a
get region prim saving working properly in SQLiteNG
...
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
f313d57fa4
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 20:11:26 +01:00
1b488c2581
dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
...
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
e78f874cfd
put SQLiteNG classes in their own namespace to avoid confusion
2010-04-23 19:40:15 +01:00
56f60a04d9
Add an additional serialization call do the detach procedure. This call is
...
executed only for it's side effects, which are to block until attach(NULL_KEY)
completes, before commencing detachment.
2010-04-23 20:18:34 +02:00
fcbac43114
minor: correct the assembly information for SQLiteNG
2010-04-23 19:14:43 +01:00
5ee77886ac
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 19:05:32 +01:00
e84cc2f9db
Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
...
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
Kitto Flora