ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-09-02 03:17:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,303 Commits 5 Branches 97 Tags
eacd8d0263fa41c4d45c880b02f5be709eaab32f
Commit Graph

10376 Commits

Author SHA1 Message Date
AlexRa
eacd8d0263 MySQL: added CreatorID, moved asset_flag to migration script 2010-05-19 21:50:30 +03:00
AlexRa
accf8c420d SQLite: CreatorID added (and asset_flags moved) to the migration script 2010-05-19 21:49:30 +03:00
AlexRa
c6977cbd4d Added CreatorID to SQLite asset data 2010-05-19 21:49:24 +03:00
AlexRa
ccee95552f A bit of harmless refactoring in SQLiteAssetData.cs 2010-05-19 21:49:22 +03:00
AlexRa
527a257b9f Kind of fixed Melanie's "Exception(sql)" correction 
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle.  Also, there is a catch one level up,
so is this one necessary?
 2010-05-19 21:49:18 +03:00
Melanie
e4b8d76b10 Change appender to deal with line feeds more intelligently. 
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
 2010-05-19 04:17:56 +01:00
Melanie
0c209a469b Clean up output a bit 2010-05-19 03:48:03 +01:00
Melanie
20642f2f21 Fix the migration message to say "Continuing" again. Remove line feed, which 
prevented the full message from displaying.
 2010-05-19 03:26:37 +01:00
Melanie
9fa8013ca5 Remove the return that was inserted in the last merge to allow 
migrations to continue in the face of an error
 2010-05-19 03:07:31 +01:00
Melanie
dedc0c0bd4 Revert "Allow migration steps to fail again without bringing down the house" 
This reverts commit 167db50259.
 2010-05-19 02:47:31 +01:00
Melanie
167db50259 Allow migration steps to fail again without bringing down the house 2010-05-19 02:33:23 +01:00
Melanie
298368dd99 Merge commit 'alex/mssql-estate-bugfix' 
This fixes some type conversion bugs and also makes the estate lists
work properly for MSSQL. Strawberry, please check this.

Signed-off-by: Melanie <melanie@t-data.com>
 2010-05-18 23:39:09 +01:00
Melanie
d2bc673667 Make m_log in migrations private. Define new m_log in derived class 2010-05-18 23:33:05 +01:00
Melanie
caf61ab7d8 Binary Guids are 16 chars long. Fix parser. 2010-05-18 23:22:30 +01:00
AlexRa
deae030145 Some more corrections after MySQL connector update 2010-05-19 02:28:19 +03:00
AlexRa
8a0c5d14d4 All (?) MySQL stores fixed to use DBGuid.FromDB() 
This was needed if we want to update to the latest MySQL
connector dll.  It automatically converts CHAR(36) to
Guids, so getting them as strings no longer works.

By using DBGuid.FromDB(), we unlink from any particular
storage format of GUIDs, could even make them BINARY(16)
if we like.

Actually not all MySql units are touched, but the remaining ones don't
seem to be affected (they don't read GUIDs from DB)
 2010-05-19 01:33:02 +03:00
AlexRa
a27d49b188 Added DBGuids.cs (static func DBGuid.FromDB() 
This DBMS-independent function to be used converting UUIDs
from whatever format used in the DB (string/binary/Guid).
This is mostly needed for MySQL, as in MSSQL they are always
UNIQUEIDENTIFIERs and in SQLite always strings (but would look
better if we use it there anyway).
 2010-05-19 01:32:50 +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
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
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
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
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
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
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
Justin Clark-Casey (justincc)
4b755c6d80 delete now unused MessageServerInfo 2010-05-15 02:17:10 +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
Justin Clark-Casey
3d72a73b22 Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
 2010-05-14 21:25:14 +01:00
Diva Canto
4e7013d5d5 Made fields consistently protected. 2010-05-13 07:59:30 -07:00
Diva Canto
739b5e2c08 Fixed a typo in the Friends packaging (Pricipal -> Principal) that was making offline friendship offers fail in grids. 2010-05-10 08:01:00 -07:00
Melanie
31dc77d8a1 Return agents when angle is PI 
Fixes Mantis #4703
 2010-05-10 04:02:56 +01:00
Melanie
3e8ceb3509 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-10 03:57:44 +01:00
Melanie
89c762209c Fix a null ref on region crossing 2010-05-10 03:57:17 +01:00
Diva Canto
6f2f0fa0ca OK, this really fixes it, I promise. 2010-05-09 14:12:59 -07:00
Diva Canto
9cf6b81256 Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here. 2010-05-09 14:02:02 -07:00
Diva Canto
b233a4b2ca * Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. 
* Fixed small bug with map search where the local sim regions weren't found.
 2010-05-09 13:39:56 -07:00