Melanie
6eef334059
Merge commit 'alex/Migrations'
...
Adding what, in the World according to Alex, will fix the tests
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 21:00:10 +01:00
AlexRa
020f38774f
MS SQL migrations converted to the new format
2010-05-18 22:16:13 +03:00
AlexRa
6e7b3950d7
Migrations for SQLite converted to new format
2010-05-18 22:16:10 +03:00
AlexRa
e4419c34c3
Converted MySQL migration history to the new format
...
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-18 22:16:06 +03:00
AlexRa
4ebb985b46
Added MySqlMigrations.cs (supports stored proc/funcs)
...
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-18 22:16:03 +03:00
AlexRa
ade2e5a9d2
Embedded MySql.Data.dll updated to 6.2.3.0.
...
This is necessary to correct a known problem with the
DELIMITER command in previous versions of the client library.
2010-05-18 22:16:00 +03:00
AlexRa
f4450ccf4f
Migration.cs supports single-file migration history format
...
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately. The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.
Status: TESTED and works fine in all modes!
2010-05-18 22:15:56 +03:00
AlexRa
d95f232629
Massive bugfix in MSSQLEstateData (now works!)
2010-05-18 21:08:51 +03:00
Melanie
e260610c00
Merge branch 'Migrations'
...
This merges AlexRa's work on migration streamlining. This merge is experimental.
If it causes issues, feel free to back out.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 19:03:16 +01:00
Melanie Thielker
55f124745f
Allow remote admin to be used on a different port from the main region port
2010-05-18 19:25:40 +02:00
Melanie Thielker
3e1f2ddb8e
Allow remote admin to be used on a different port from the main region port
2010-05-18 17:01:44 +01:00
Melanie
1c3790a70d
Merge branch 'master' into careminster-presence-refactor
2010-05-18 15:31:19 +01:00
Melanie
df04ccfdc3
Change an exception reporting to include the stack trace. "e.Message" just
...
_won't_ do. Might look more elegant, but it's too little information.
2010-05-18 15:30:08 +01:00
Tom Grimshaw
bb0806c61e
Don't send kill packets to child agents as we close them
2010-05-18 03:44:09 -07:00
Tom Grimshaw
1c040d8c1e
Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it.
2010-05-18 03:24:43 -07:00
Tom Grimshaw
ed1cfb5245
Missed a nullref in the previous commit
2010-05-18 02:33:41 -07:00
Tom Grimshaw
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
Tom Grimshaw
ae7c30a0f3
While examining our 10,10,10 issue I discovered that several threads were locked with each other in an unusual place; I've moved the piece of code inside a lock[] context and so far it's looking promising.
2010-05-18 00:07:17 -07:00
Melanie Thielker
eb5a95d26b
Prevent an "index out of range" error on login
2010-05-18 03:02:36 +02:00
Tom Grimshaw
c25c40a3f9
Following on from the last commit, the stop/disconnect packet should NOT be sent when the user logs out. This eliminates the annoying "crash on log out" bug, and allows the client to commit important information at the last moment (attachment data!)
2010-05-17 15:24:28 -07:00
Tom Grimshaw
6bc7e3429f
Provide interface to prevent the client close function from sending the stop packet
2010-05-17 14:32:21 -07:00
Tom Grimshaw
8f838c722d
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
2010-05-17 14:14:19 -07:00
Melanie
a003c36de5
Merge branch 'master' into careminster-presence-refactor
2010-05-16 20:32:58 +01:00
Melanie
a6023ea89e
Prevent a crash when the two agent dictionaries get out of sync
2010-05-16 20:31:02 +01:00
Diva Canto
2fb79646c6
Fixes mantis #4691 for real. This time I tested it, and it works.
2010-05-16 10:32:57 -07:00
Melanie
d8bf370fd6
Merge branch 'master' into careminster-presence-refactor
2010-05-16 17:22:38 +01:00
Diva Canto
0b43b263d4
Fixes mantis #4691
2010-05-16 09:12:40 -07:00
Diva Canto
b7e6b58857
Fixes mantis #4622 .
2010-05-16 09:01:27 -07:00
Diva Canto
49f4becdae
* Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
...
* Added a comment in LLLoginService.cs, for future reference
2010-05-16 08:10:57 -07:00
AlexRa
dfeb9a0b5c
MS SQL migrations converted to the new format
2010-05-16 17:04:50 +03:00
AlexRa
1ad12851d0
Migrations for SQLite converted to new format
2010-05-16 17:04:39 +03:00
AlexRa
ee713cb253
Converted MySQL migration history to the new format
...
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
Melanie
a723225179
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-16 15:02:23 +01:00
Melanie
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
AlexRa
b49fb3db7c
Added MySqlMigrations.cs (supports stored proc/funcs)
...
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
AlexRa
a49716dc2f
Embedded MySql.Data.dll updated to 6.2.3.0.
...
This is necessary to correct a known problem with the
DELIMITER command in previous versions of the client library.
2010-05-16 16:24:50 +03:00
AlexRa
8b6a295874
Migration.cs supports single-file migration history format
...
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately. The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.
Status: TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
Teravus Ovares (Dan Olivares)
a974146921
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-16 01:48:28 -04:00
Teravus Ovares (Dan Olivares)
d4192dcb2e
* Revert last commit for now at Melanie_T's request.
...
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
Diva Canto
ff4f50396a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-15 20:28:14 -07:00
Diva Canto
e5e52e4072
This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing.
2010-05-15 20:27:25 -07:00
Teravus Ovares (Dan Olivares)
019925bb2f
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-15 23:22:07 -04:00
Teravus Ovares (Dan Olivares)
dc1a3e9787
* Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files.
2010-05-15 23:21:36 -04:00
Diva Canto
74b23ff9c6
Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets.
2010-05-15 19:58:30 -07:00
Diva Canto
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
unknown
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
Dan Lake
36bcab5f07
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-15 02:20:23 -07:00
Justin Clark-Casey (justincc)
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
Justin Clark-Casey
df2f69f295
Make "nant distbin" remove BUILDING.txt
2010-05-15 02:07:07 +01:00
Justin Clark-Casey (justincc)
98f2b798ff
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
2010-05-15 01:07:45 +01:00