b63922dcfe
* Minor fix to previous threading patch, every nTH request would previously have been delayed for 1000ms. This has been fixed.
2008-08-30 13:46:04 +00:00
0a5280edb5
* Added new "SuperManager" class for MySQL connections, for allowing multiple concurrent MySQL threads.
...
* Implemented SuperManager inside of UserData. This means the userserver when running on MySQL will use 10 connections (+1 system connection) to handle requests, preventing the previous mire of locking resulting in singlethreadedness.
* This requires testing and grids relying on stability should not upgrade to this revision until it's been properly tested.
2008-08-30 13:38:46 +00:00
605ceb6176
Fix for Bug #2065 : New check out crashes on sqlite migration
...
I apparently missed one drop tables statement that was actually needed
when I did the cleaning to make this work for old sqlite versions.
2008-08-28 12:47:55 +00:00
3465a5772a
cleaning out cruft from pre-Migration days
2008-08-27 19:24:48 +00:00
066715415a
getting rid of pre-Migration cruft
2008-08-27 19:24:46 +00:00
c75f1fcde8
we are now past change 6000, so getting rid of pre-Migration cruft
2008-08-27 19:24:45 +00:00
b625a36ae5
we are now past change 6000, so getting rid of the pre-Migration
...
upgrade cruft
2008-08-27 19:24:40 +00:00
5bf5e1c320
remove legacy pre-Migration database upgrade routines
2008-08-27 18:51:43 +00:00
49df787665
remove the legacy pre-Migration database upgrade paths
2008-08-27 18:51:42 +00:00
ba16a27ab0
remove pre-Migration upgrade paths
2008-08-27 18:51:40 +00:00
53afa23608
we're past checkin 6000, so now cleaning up all the cruft of the pre
...
migration database upgrade paths. This is coming in in stages.
2008-08-27 18:51:36 +00:00
f87f8b3b9f
get rid of the "drop if exists" lines in this old migration, as those
...
tables shouldn't exist yet, and the exists keyword is relatively new in
sqlite. This has been breaking a lot of people on Suse Enterprise Linux,
for instance.
2008-08-27 17:32:02 +00:00
e2b0852c93
Mantis#2052. Thank you kindly, Avdleeuw for a patch that:
...
After having built revision 5992, OpenSim would start while
issuing some errors regards updates to user profiles (Master
Avatar, and other manually added avatars). Issue 2027 dealt
with the MySQL part. This issue deals with the SQLite part.
2008-08-27 02:45:10 +00:00
d2f2ec12fd
Mantis#2027. Thank you kindly, HomerHorwitz for a patch that addresses:
...
Analysis shows that the XMLRPC-request contains an empty string (<string />)
for the custom_type parameter, which is deserialized wrongly to a null-value,
thus leading to the exception above. The attached patch (against r5967) fixes
the symptom and uses "" for customType in that case.
2008-08-24 18:32:39 +00:00
07cb1d4f0e
Selling an object in-place (as original) now works. Builders can
...
now ply their trade. Is that nuts?
2008-08-24 06:39:54 +00:00
c9b5641c49
Plumb the data path for all those eye candy values. Saves texture
...
animation, target omega, looped sound, script access pin, allowed
drop state and sale data. Loads it, too. Not all tested.
Code: No Nuts. Data: Cannot Guarantee Nut Free.
2008-08-24 05:25:26 +00:00
f9ec65bc21
Add the fields for the eye candy and sale featires to the prims table.
...
No user functionality yet.
Run prebuild. Contains a Migration. May contain nuts.
2008-08-24 03:15:02 +00:00
07b04213d7
Update svn properties, minor formatting cleanup.
2008-08-19 22:41:39 +00:00
41440e184b
Attachment persistence (Mantis #1711 )
...
Change user server to handle attachment assets record properly. Ensure
that attachments are not re-rezzed on region crossing. Persistence
will NOT WORK with earliser UGAI!!
Change region server to match.
2008-08-19 18:34:46 +00:00
bea7d4d81a
Update svn properties, formatting cleanup.
2008-08-19 02:59:27 +00:00
6d2e1ad6ba
Attachment persistence!!! Patch #9169 (Mantis #1171 )
...
Attachments now save to MySQL. No reattach on login yet.
2008-08-19 02:12:40 +00:00
a179089d1c
* If two regions have configuration information that conflicts (save xy location, same uuid or same internal ip port) then complain loudly and don't start up
2008-08-18 21:46:07 +00:00
9e6b38078a
* Properly dispose of the reader after readAttachments() has finished with it in the Mysql User data manager
2008-08-18 21:18:59 +00:00
05506cff49
Avatar Attachment persistence!! Patch #9168 (Mantis #1171 )
...
Plumbs in attachment persistence and adds the tables. Currently MySQL
only, no user functionality yet.
2008-08-18 17:22:36 +00:00
6ef9d4da90
Formatting cleanup.
2008-08-18 00:39:10 +00:00
d7f2c454f1
* Rename *DataStore classes to *RegionData to align with SQLite
2008-08-16 20:50:43 +00:00
04488d9d38
Plumb in the partner and the account title fields for profile info.
2008-08-15 22:49:26 +00:00
3e7e0c8ced
Small fox in the database, god level was being overwritten with the user
...
flags value
2008-08-15 14:33:43 +00:00
7161689a97
Adds UserFlags and GodLevel to the user data store and plumbs then in.
...
This will have no effect unless both the UGAI and the region are
this revision or later
2008-08-14 19:59:32 +00:00
35aeb9010a
Mantis #1953
...
Thank you, HomerHorwitz, for a patch that changes login location handling
to use the sim UUID if it has already been stored.
2008-08-14 16:48:51 +00:00
17715da311
Add the UserStore migrations to the TP fixes patch
2008-08-14 11:15:11 +00:00
e3157e61aa
Mantis #1946
...
Thank you, HomerHorwitz, for a patch that corrects and improves TP
to landmark and home position handling.
2008-08-14 00:04:37 +00:00
f894f5d87b
Minor formatting cleanup.
2008-08-12 00:08:41 +00:00
54af3b4f4d
Mantis#1903. Thank you kindly, CMickeyb for a patch that:
...
patch attached replaces the tree walk algorithm used to build the
folder hierarchy with a single database query. That is, we replace
1 database query per folder with 1 query for the root folder's
properties and 1 query to retrieve the entire collection of folders for a user.
2008-08-10 16:44:25 +00:00
0718aa0b7f
Minor formatting cleanup.
2008-08-07 12:55:46 +00:00
d367f0bf0c
Thanks, zaki, for a patch that embeds plugin manifest files into plugin dlls. Fix issue 1876.
2008-08-06 01:20:31 +00:00
12c5bfa3e0
Estate series, patch 9 ( #9157 )
...
Adds the new access semantics and the new flag (allow only age verified)
Plumbs in the abuse email address from sim to viewer. The other way around,
libomv appears to be lacking support for the data field in the packet.
Includes a migration, run prebuild!
2008-08-01 21:08:00 +00:00
c9b39972ca
Add the missing migration files :/
2008-08-01 02:54:28 +00:00
43f3b9ad7b
Patch #8 in the estate series. Introduces the concept of an estate
...
owner (alongside the master avatar) and provides storage fo the
abuse email address. No user functionality yet.
This patch includes a migration.
2008-08-01 02:14:34 +00:00
15669281fa
Apply updated patch from issue 1871. Thanks sempuki.
2008-07-31 23:53:24 +00:00
2270b25265
Thanks, sempuki, for a patch that moves all Grid Server's plugins to
...
PluginLoader. Fix issue 1871.
2008-07-31 09:24:28 +00:00
8edab95bad
* Refactored some heavily duplicated RequestSimProfileData functions
...
* Changed InventoryUrl and GridServerURL type to Uri instead of string - to address '/' issues.
2008-07-29 19:52:58 +00:00
2a1bc318b0
The hazards if unclean sourc trees. Yours truly got bitten this time.
...
Re-fix the re-fix from a clean build. This makes the region based
settings work as advertised
2008-07-26 18:54:59 +00:00
3b1efa4348
Re-Fix the fix
2008-07-26 18:46:04 +00:00
1321bd25b8
Fix Mantis #1830
...
Makes region settings save on second and subsequent sim restarts
after upgrading.
2008-07-26 18:03:50 +00:00
fd4e703f25
* Remove dumb bug I put in which meant that an archive save would never complete if there were any missing assets
2008-07-25 15:18:24 +00:00
81cb72b5ad
squashing warning.
2008-07-25 12:59:18 +00:00
5998fb712a
Patch #9155 (Mantis #1793 )
...
Fix a regression that caused the region settings not to save.
Still no SQLite support for region settings. MySQL now functional.
2008-07-25 06:17:43 +00:00
1c9551eaae
few additional fixed to get prim inventory up on nhibernate
2008-07-23 22:14:37 +00:00
30a77b5b9f
implemented prim inventories for nhibernate
2008-07-23 22:14:34 +00:00
47ad705675
fix column mapping
2008-07-23 22:14:32 +00:00
6720f4c289
complete the prim inventory mapping
2008-07-23 22:14:31 +00:00
cf317f5c33
refactor TaskInventoryItem Mask -> Permissions to be consistant with how things
...
are stored in the db.
2008-07-23 22:14:29 +00:00
3c227390c0
add primitems migration for nhibernate
2008-07-23 22:14:23 +00:00
090159defc
refactored LandData to use properties, and cleaned up the naming on
...
the properties a bit to be more consistant with other objects (having things
like .Name .Description, etc).
2008-07-23 15:50:32 +00:00
80d8e2889e
Update svn properties. Formatting cleanup. Remove a compiler warning.
2008-07-23 13:24:25 +00:00
a0930aa80d
Thanks, sempuki, for a patch that moves control of Mono.Addins from source attributes to external XML files. Fix issues 1682 and 1786.
2008-07-23 03:08:31 +00:00
186f83692c
Update svn properties. Squash a couple of warnings.
2008-07-22 15:01:04 +00:00
681433c4b7
Mantis#1796. Thank you kindly, StrawberryFride for a patch that:
...
Agent table code (INSERT / UPDATE, etc) now added to MSSQL provider.
2008-07-20 22:16:50 +00:00
212ab8c6d9
Change SQLite argument marker from the more standard '@' to the ':' supported
...
but earlier versions of the SQLite dll
2008-07-19 21:01:10 +00:00
19fd2230bf
Update svn properties. Fix some inconsistent newlines.
2008-07-19 09:35:48 +00:00
a73d87ef16
Introduce a separate connection string for estates, which defaults to the one gi
...
ven for the region datastore. Removes the flag to store prim inventories, which are now always stored.
2008-07-18 20:50:47 +00:00
bbd076544d
Patch to fix saving of estate managers list loaded during migration.
...
No longer teleports an agent home unless their root agent is being banned.
Visual blocking is still in effect.
2008-07-18 19:32:05 +00:00
449c09234d
fixing copy & paste artefact.
2008-07-18 15:36:38 +00:00
611b56070b
add some locks back into the sqlite asset path, as something changed
...
that is causing a lot of out of order execution on asset fetches on
multi region sims.
2008-07-18 15:34:32 +00:00
df1485fc51
remove all the odd quoting, on the off chance this was causing some
...
of the issue.
2008-07-18 15:19:52 +00:00
d9ba7c8339
put the entire thing inside a transaction. This probably doesn't
...
help much, but it might.
2008-07-18 15:13:19 +00:00
e2a3be254f
fix typo in create index that caused the entire migration to fail.
...
put some drop table if exist clauses in here to hopefully let this
migration work for people that are in an intermediary broken state
right now.
2008-07-18 15:10:20 +00:00
aec5f0ceed
found a better pattern for SaveOrUpdate with nhibernate
...
cleaned up the asset path a bit
2008-07-18 15:06:24 +00:00
d44dcdf97b
remove NHPrim, this turned out to be a bad idea
2008-07-18 13:44:16 +00:00
0171e76246
squashing further warnings.
2008-07-18 10:57:18 +00:00
e0e0db3660
Thanks, sempuki, for a patch that moves all grid plugins to new PluginLoader (issue 1763).
2008-07-18 04:51:41 +00:00
230a7ecaec
masks MySQL password from console startup messages
2008-07-18 03:23:40 +00:00
263633e274
Patch #9151
...
Makes the estate dialog fully functional. Implements all client facing functionality. Moves estate data from estate_settings.xml, which is used to provide defaults, to the region data store. Creates one estate for each region, and places the region in it. Converts all region bans to estate bans.
2008-07-18 02:40:47 +00:00
f54828c957
fix build break
2008-07-17 21:07:39 +00:00
18a5cfd10f
terrain is close to working, but I still end up at the bottom of the sea
...
right now.
2008-07-17 20:58:24 +00:00
50eab18590
need to synchronize the terrain updates
2008-07-17 20:58:23 +00:00
4663999c24
first pass at Terrain implementation
2008-07-17 20:58:20 +00:00
366e09b543
add a Terrain object for the purpose of mapping. This may make sense
...
to stick up in framework later, but for now we'll just keep it close
to the data.
2008-07-17 19:58:47 +00:00
8f2154916b
if no texture, make it plywood
2008-07-17 19:58:45 +00:00
6084a7ea3e
Revert "git merge"
...
This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.
2008-07-17 18:59:10 +00:00
dd144e12ba
git merge
2008-07-17 18:59:06 +00:00
1c0f27b013
finish NHibernate mapping for prims, and it even seems to work
2008-07-17 18:59:04 +00:00
43df32c52c
fix the null case for deep copy
2008-07-17 18:59:02 +00:00
d5e0a3a184
got basic region object saves working time for lunch
2008-07-17 18:58:47 +00:00
9aa0302e5b
early remove calls
2008-07-17 18:53:38 +00:00
e8412dcd42
Mantis#1736. Thank you kindly, StrawberryFride for a patch that:
...
Many issues with handling connections in MSSQL, have rearchitected to
ensure that connections are always opened and closed in a timely fashion
& disposed of cleanly, and removed unnecessary lock statements. SQL
Server performance seems to have improved considerably as a result,
and various timeout errors seem to have been fixed.
2008-07-17 13:43:31 +00:00
2a30e85c97
added index to ParentID on prims, as this is sorted on for prim loading.
...
This should speed up initial load of prims, especially on primy regions.
2008-07-16 22:16:46 +00:00
40ab5f2085
clean up mappings for parent id
2008-07-16 21:28:01 +00:00
6adac3bd5a
getting close on saving prims via nhibernate
2008-07-16 21:27:59 +00:00
d3190236cc
fix RegionStore creation so that the .sql file works
2008-07-16 21:27:55 +00:00
194ffb4d88
made SOP have a blank setter for 2 convenience properties.
...
Got RegionStore mapping to the point that nhibernate would start, though
definitely not complete
2008-07-16 21:27:52 +00:00
f3173735fa
Revert "refactoring of PrimitiveBaseShape to properties"
...
This reverts commit 60e13a9997da89d224fbe8a97ab42bfc6114a45f.
2008-07-16 15:10:35 +00:00
1e447478b8
refactoring of PrimitiveBaseShape to properties
2008-07-16 14:41:57 +00:00
c6b1a190bc
refactoring primitive base shape to use properties
2008-07-16 14:41:49 +00:00
309e479ac4
work in progress on nhibernate
2008-07-16 14:40:19 +00:00
2f46ab5096
add migration for SceneGroupID to char(36) plus add an index. This
...
should actually speed up deletes substantially, especially for large
regions, as this was a table scan before.
2008-07-15 20:06:58 +00:00
b5efb49d74
added new ParentUUID property to map out from SOP.
...
Updated some nhibernate parts, started in on migration.
2008-07-15 18:57:18 +00:00
5d0b6343a0
killing a lonesome warning that managed to creep in...
2008-07-15 12:02:49 +00:00
12173034d9
Patch #9148
...
Patch 5 in the region settings series. Adds a migration to ensure corrupted
data is purged and re-read from defaults. Some changes. Still no full
functionality
2008-07-14 01:29:48 +00:00
da55f4d2ae
* minor: comment out a couple of lines to eliminate nhibernate compile warnings for now
2008-07-12 22:18:54 +00:00
932ed5ec54
Mantis#1726. Thank you kindly, StrawberryFride for a patch that:
...
On an MSSQL-based Grid OpenSim installation, users could log in to the sim once,
then log off - after a short time before retrying users would be unable to log in,
and would see an empty alert box on the client with just a "close" button and no text.
Despite no users being logged into the sim, user server would report a higher number
of logins than logouts.
2008-07-12 18:05:57 +00:00
19c4c9798b
changes to use NHPrim instead of SOP directly
2008-07-07 21:50:45 +00:00
b2febd03f0
add NHPrim to subclass SOP so we can stick region uuid in there.
...
I think the only place we need it is in NHibernate so a subclass
is probably appropriate.
2008-07-07 20:52:13 +00:00
7634c1311e
added skeleton (no function) region store component
2008-07-07 20:40:14 +00:00
867d72c956
change SitTarget calls from functions to properties
2008-07-07 20:12:14 +00:00
1813946937
* remove unused CommitAssets() hook for now
2008-07-07 19:18:44 +00:00
d470d30c09
Copyright notices and formatting cleanup.
2008-07-06 14:02:22 +00:00
7fea52be35
Mantis#1661. Thank you kindly, CMickeyb for a patch that:
...
patch attached to check for timeouts on mysql connections *before*
operations occur that are likely to timeout. if timeout occurs or
the connections is down, it is reconnected before the operation fails.
2008-07-03 22:30:16 +00:00
a9b3c2582a
add 3 migrations, 1 each for prims, primshapes, and primitems
...
to move all their UUID stores from varchar(255) -> char(36). Based
on past evidence, this should help with performance.
2008-07-03 19:41:01 +00:00
8eb57b68f3
migrate the myisam mysql regions to innodb
2008-07-03 18:45:32 +00:00
f0f1e00ec3
add a couple of LL conversion properties to SOP. I'll wait to clean
...
up the sit target usage until the sit target fix patch goes in, but it should
be cleaned.
Get prims table mappings to the point where nhibernate likes them enough
to start.
Remove field from asset mapping so it will start
2008-07-03 18:25:18 +00:00
b9bba13c39
playing with multicolumn mapping of vectors using a custom type
2008-07-03 16:37:44 +00:00
fde6983cce
Update svn properties.
2008-07-03 03:01:02 +00:00
9052c43319
* Drop InvType from the assets table since it is no longer used
...
* Migration should be automatic on sqlite and mysql
* Migration is not automatic on mssql, you will need to drop the invType column manually
* Migration should be fine, but as for any db change, I would recommend making sure you have backups before moving past this revision
2008-07-02 16:20:54 +00:00
bf34f65125
Mantis#1639. Thank you, Melanie for a patch that:
...
Reads estate_settings.xml and populates the database from it.
If there is no record, just passes the defaults to the application.
2008-07-01 02:16:58 +00:00
4cb42d4c35
Mantis#1637. Thank you kindly, Melanie for a patch that:
...
Make each region load it's settings from the database on startup.
No user functionality yet.
2008-06-30 14:09:19 +00:00
31c63558c8
* Fix for http://opensimulator.org/mantis/view.php?id=1512
...
* Introduce experimental wait timeout checking to mysql region datastore code
* This should mean that if the mysql connection has timed out, we should automatically reconnect and not fail or drop queries on region database manipulations
2008-06-29 18:10:38 +00:00
f3f31744ab
patch and files from mantis #1630 , Thanks Melanie
2008-06-29 11:48:58 +00:00
748f72326d
last round of warning squashing. calling it a day now.
2008-06-27 23:03:39 +00:00
feb30217de
dr scofield's warning safari:
...
* commented out [Obsolete(....)] attributes where no replacement feature
was available: if we want to attribute code that we think needs to be
reworked, we should define a new attribute and use that instead
(together with a little tool to retrieve all the attributed code then)
* commenting out unused variables
2008-06-27 16:58:21 +00:00
afd2a4b206
somehow, I seem to have actually made appearance persistant
...
correctly with nhibernate. Go figure. :)
User services still remain partial, but I'm going to move
on to Region Store to get that chunk out of the way.
2008-06-27 14:53:56 +00:00
c8cd381c56
added in new type for mapping texture objects to the db
2008-06-27 14:22:18 +00:00
ca8d1d57e1
Mantis#1591. Thank you graciously, Sempuki for a patch that:
...
Currently module loading is done ad-hoc. I propose creating a simple
loader class that leverages Mono.Addins (and perhaps the new .NET
addins when they become available in mono). Attached is a basic
patch for review that compiles into HEAD, but doesn't yet replace
any existing ad-hoc loaders.
2008-06-27 02:15:57 +00:00
f8ccf00f1c
Apply patch from bug #1609 -- Documentation for Data/MSSQL. Thanks kerunix_Flan!
2008-06-26 20:25:57 +00:00
d96caaa14e
Apply patch from bug #1606 -- Documentation for Data/Null, Data/Base. Thanks kerunix_Flan!
2008-06-26 20:20:30 +00:00
9fae975a53
Apply patch from bug #1605 -- Documentation for Data/SQLite. Thanks kerunix_Flan!
2008-06-26 20:14:33 +00:00
ca724636d4
Apply patch from bug #1601 -- more documentation for Data/MySQL. Thanks kerunix_Flan!
2008-06-26 12:38:03 +00:00
1c6bf4fe77
Mantis#1595. Thank you, Melanie for a patch that:
...
Adds pipes for the prim item flags field
2008-06-26 02:51:59 +00:00
8a0a0f9bb5
Add patch from bug #1596 - adds Doxygen documentation in OpenSim.Data.MySQL files. Thanks kerunix_Flan!
2008-06-26 01:12:28 +00:00
d1d846f23f
chugging away on nhibernate, more incremental process
2008-06-25 19:45:56 +00:00
ce9c584341
add migrations to mysql and sqlite for flags on embedded inventory
2008-06-25 18:57:21 +00:00
ee4d7703a2
lazy=true for these mappings, as we don't do full lists very often
2008-06-25 18:51:48 +00:00
a2b1a1787d
Minor formatting cleanup.
2008-06-25 14:30:28 +00:00
c0a083ad38
based on positive feedback on performance of making keys fixed length
...
for assets, make all the indexed columns in the inventory fixed length
via migration.
2008-06-24 18:01:28 +00:00
ca7aac1c27
fix typo in Inventory nhibernate mappings. nhibernate should
...
load now.
2008-06-23 20:02:15 +00:00
8b6bd93d68
add migration to go from varchar -> char for uuid. Tested
...
on my machine, and works, but backing up before migrations
is always a good idea.
2008-06-23 16:00:18 +00:00
2758bc81ad
* Persists region banlists across reboots for the sqlite datastore also now.
2008-06-21 06:50:38 +00:00
a5860ad438
* Adds Region ban capability to Regions. You access this by going to World->Region/Estate. Then on the Estate tab, at the lower right hand corner, clicking the 'Add' button and picking an avatar.
...
* It only persists across reboots for the mySQL datastore currently.
* Currently have stubs in the other datastores.
2008-06-21 03:29:08 +00:00
17fd6cf661
lots of futzing with nhibernate to make it more efficient. I
...
don't think this works, but I don't want to loose the work before
the weekend, and it doesn't break the build.
2008-06-20 20:23:55 +00:00
4448fd4b2f
* Handle parcel telehub location corruption gracefully. DBNull
...
* mySQL this time.
2008-06-20 18:46:43 +00:00
f8b1785467
* Handle parcel telehub location corruption gracefully. DBNull
2008-06-20 17:07:01 +00:00
ccc2adb331
fixed to inventory for nhibernate that actually make it so I can
...
log in using it as the driver for users, assets, inventory. User
driver is still missing a lot of function.
2008-06-19 22:11:04 +00:00
c2e2997a99
more work towards nhibernate working with mysql, not there yet,
...
but moving in the right direction.
2008-06-19 21:20:23 +00:00
40f32a9271
oops, build break. needed to include another reference.
2008-06-19 15:44:33 +00:00
d28a5a4de7
add migrations support for mysql log store. This should complete
...
all the mysql bits for migration.
2008-06-19 15:42:57 +00:00
fcd7cf5e4a
fix an edge case with migrations in the region store.
...
Add migration support to gridstore.
2008-06-19 15:03:00 +00:00
c2dc1636a6
oops, it helps to reference the *right* migration
2008-06-19 14:46:54 +00:00
6dea8f3435
clean up the nhibernate definitions to work with mysql
...
integrate migration support into nhibernate
2008-06-18 21:14:19 +00:00
b58dc7fb33
add mysql migrations for nhibernate driver
2008-06-18 21:08:16 +00:00
6711adb8b1
add inventory store migration
2008-06-18 20:51:42 +00:00
be79b56cc3
I really didn't expect that one to work out of the box, but just managed
...
to get NHibernate + MySQL + Assets working.
2008-06-16 19:58:48 +00:00
bdb0dddfcf
set CommandTimeout = 0 in the migration commands so that long
...
migrations (like converting asset ids) don't run into the
normal 30 second kill switch.
2008-06-16 19:39:08 +00:00
e1409e0c04
be a bit more verbose about what we are doing on the migration
...
side so that people don't think we're hung.
2008-06-16 19:33:08 +00:00
340ef33e2e
fix nhibernate driver so that it starts (based on the appearance
...
changes it wouldn't come up).
include embedded dialect specific sql files for nhibernate migrations
figure out how to get the raw db connection so that migrations can
work with nhibernate.
create initial migration for NHibernate + SQLite + Assets.
2008-06-16 19:22:00 +00:00
caa6b8467d
futzing around on the NHibernate side again trying to connect
...
migrations into it.
2008-06-16 18:53:55 +00:00
94034d665d
change some messages on the migrations front to be
...
more clear
2008-06-16 16:03:37 +00:00
ec78a2871b
the beginning of the great id format migration. This makes
...
asset uuids no longer binary. I've tested this migration a
few times, and it seems working in all the scenarios I've found
but it wouldn't hurt to backup your asset db before running this
as it does touch a very sensitive part of our content system.
2008-06-16 14:10:51 +00:00
6c23acf41b
add indexes for sqlite inventory
2008-06-13 14:27:46 +00:00
64f01ade04
Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.
2008-06-13 00:21:53 +00:00
1451d6fb9a
look mom, migrations in action. This adds a couple of indexes
...
to mysql regions that should help on performance of some of the
selects. We should start capturing more data on performance bits
to figure out where else we are missing indexes and add them via
migrations as well.
2008-06-12 20:48:06 +00:00
202a4bec13
Fix mysql migrations. This is tested with an existing up to date schema,
...
and no schema. It should also work with a non up to date schema as well.
Btw, meetings in which I can get code done are the right kind of meetings.
2008-06-12 18:44:58 +00:00
7cdedcaf0e
* minor: Remove and tidy duplicate 'storing object to scene' messages in log
2008-06-12 18:18:59 +00:00
e1140a4f9b
this, in theory, adds migration support to mysql for all
...
data sources besides the grid store. It is only lightly tested
so the less adventurous should wait a couple of checkins before
upgrading.
2008-06-12 15:47:33 +00:00
cee071ea60
check in region store initial migration definition,
...
now on to integrating this approach into the mysql
driver. Beware the next couple of checkins.
2008-06-12 15:21:34 +00:00
4387744a78
check in migration files for mysql
2008-06-12 14:44:52 +00:00
6c1fce6147
check in working migration code fore SQLite. This
...
is now using migrations instead of the old model to
create tables. Tested for existing old tables,
and for creating new ones.
2008-06-11 21:01:33 +00:00
68b98aecab
updated resources for current sqlite schema for migrations
2008-06-11 20:04:01 +00:00
aba396cb32
Mantis#1528. Thank you kindly, Boscata for:
...
MSSQL Avatar appearance solved.
Appearance functions and modified table.
2008-06-11 13:57:32 +00:00
be400d1bd0
I'm going to need the Version property to manage
...
migrating from the old to the new system. Silly legacy
code.
2008-06-10 23:17:18 +00:00
68cda63761
update of migration code to be more sane on version
...
tracking, and support sub types that we'll need for
nhibernate.
2008-06-10 22:57:20 +00:00
53cc63e243
Mantis#1501. Thank you kindly, Nebadon, for a patch that
...
addresses the 'terrain fill 0' error.
2008-06-10 16:02:18 +00:00
5910a49da6
Update svn properties. Formatting cleanup.
2008-06-10 08:35:46 +00:00
c62f081380
actually create and populate the migrations table correctly.
2008-06-09 22:20:28 +00:00
69fb4ee208
migrations seem to not break anything at this point.
...
Tomorrow I'll start trying to integrate them into sqlite
to see if this works right for table migration.
2008-06-09 22:01:21 +00:00
504ab4477d
move Migration support into OpenSim.Data, because it
...
really turned out to be small enough to not need it's own
assembly
2008-06-09 21:40:16 +00:00
2e2dde71f2
fill out some more migration facilities
2008-06-09 19:37:13 +00:00
c30e9ff0f1
more work in progress migration code, still a while before
...
this becomes useful
2008-06-09 19:11:49 +00:00
283cc90566
start in on the shell for a generic database versioning module. My
...
intent is to create an easier way to manage database table versions
like the model used for ruby on rails migrations.
2008-06-09 18:24:07 +00:00
c3292a9afa
*Patched CreateItemsTable.sql (MSSQL). Patch by Kyle and Chris from G2.
2008-06-09 14:48:28 +00:00
de0bd2b5a0
MSSQL Inventory Fix. Patch by Kyle and Chris from G2
2008-06-06 00:56:51 +00:00
c289c2b6d4
Mantis#1450. Thank you kindly, Boscata for a patch that addresses:
...
I have detected a bug of conversion data type in OpenSim.Data.MSSQL.MSSQLInventoryData.addInventoryItem(InventoryItemBase item)
in the GroupOwned field.
My sollution is to change the flield to bit in the table. In the
readInventoryItem(IDataReader reader) change too item.Flags =
(uint) reader["flags"]; to item.Flags = Convert.ToUInt32(reader["flags"]);
Now Inventory runs fine.
2008-06-05 13:57:58 +00:00
4ec4e16c80
Formatting cleanup, minor refactoring, svn properties.
2008-06-04 09:59:27 +00:00
4453c8bc5c
* experimental: Make OpenSim archiver save and reload all prim textures when not all faces have the same texture
2008-06-02 17:23:13 +00:00
0c21f90ba7
* Duh, actually returning from the CreateAsset method once we know the asset exists would be better than carrying on
2008-05-31 21:54:13 +00:00
7752211376
* Remove the mysql logging noise I accidentally left in a few commits ago
2008-05-31 21:53:17 +00:00
d703e2004f
* Change MySQL to check whether an asset already exists before inserting it into the database
2008-05-31 21:44:57 +00:00
febe78d062
* Implements UserServer logoff in a few situations
...
* User tries to log-in but is already logged in. Userserver will send message to simulator user was in to log the user out there.
* From the UserServer, admin types 'logoff-user firstname lastname message'.
* Some regions may not get the message because they're not updated yet.
2008-05-31 12:18:29 +00:00
0462510956
Update svn properties. Formatting cleanup.
2008-05-30 08:35:57 +00:00
858ddfa605
update the nhibernate inventory item base definition
2008-05-28 19:40:42 +00:00
11d83cb737
actually user the database_connect string for mysql.
...
This means you can run all the OpenSim grid services without
needing a mysql_connection.ini
2008-05-28 18:12:32 +00:00
89c164fbc1
let Grid Servers specify a connect string in their configuration.
2008-05-28 17:59:46 +00:00
7ddf183da4
remove terrain bloat, only keep last terrain revision
...
for mysql. For active terraformers this should return
a lot of database space.
2008-05-28 15:02:04 +00:00
a28a6e9aaa
remove an erroneous line to fetch the terrain table in a way that
...
isn't actually used.
2008-05-28 14:57:24 +00:00
77281ed85c
* Potential fix for Mantis#167, 332 - MySQL Thread collision.
2008-05-26 21:53:32 +00:00
5d77625e9a
Update svn properties. Formatting cleanup.
2008-05-25 23:27:38 +00:00
1ebc6bfd0a
add a lock on the update, this should have been there before.
...
still not convinced this will help, but it was wrong.
2008-05-22 18:31:47 +00:00
3e997772ea
implement in memory appearance cache for sqlite. This
...
isn't db backed, but will hang around between reboots.
2008-05-21 20:36:34 +00:00
53bcf2139e
this removes use of the mapper for wearables, and I can confirm things
...
get saved to the database. There are still issues on wearing things
after a cleared cache that I'm looking at now.
2008-05-21 18:02:09 +00:00
0e39250506
create some direct sql calls for appearance
2008-05-21 14:34:52 +00:00
6d2f6be82b
autocreate appearance table if it isn't there
2008-05-19 21:47:31 +00:00
419adadc46
prep for changes need to create the appearance tables
...
by default
2008-05-19 21:39:02 +00:00
d1c4fc94e7
make the super class conveniance appearance stuff virtual
...
so they can be overrided correctly by subclasses
2008-05-19 20:49:57 +00:00
9808f39b6f
i can haz pantz?
...
You sure can. This change set restores pants (and the rest of the
default appearance) in grid mode. The
root issue had to do with serializing multi-faced textures to the
grid server. This also restores the lookup path through the avatar
factory module, as that seems the reasonable place to have it live.
Some clean up patches are coming later as well, plus testing on
standalone, but this should be in a good kicking around state for
grid users.
2008-05-19 19:08:59 +00:00
a5f08b430d
Formatting cleanup.
2008-05-17 00:06:35 +00:00
8a7ae313be
it helps to actually create the database if the connect
...
string is provided. My bad.
2008-05-16 18:43:53 +00:00
0076ed40ff
in theory, this moves the appearance mapper to live
...
under the MySQLUserData. There is a lot of in theory here
so testing would be appreciated.
2008-05-16 14:30:25 +00:00
e6d4c8f0c9
move AppearanceTableMapper to OpenSim.Data.Base. The mapper
...
stuff should probably be collapsed soon, as it takes up 4 assemblies
now.
2008-05-16 14:05:12 +00:00
7fefb80abb
Minor cleanup.
2008-05-16 13:33:57 +00:00
9040213366
Set svn:ignore. Minor formatting cleanup.
2008-05-16 05:30:39 +00:00
65c5efe43b
Formatting cleanup.
2008-05-16 01:22:11 +00:00
fc77364972
appearance now survives logout. Tommorrow will involve moving
...
the MSSQL and MYSQL mappers back in under datastores and looking at doing
gid bits for this
2008-05-16 00:04:46 +00:00
129e7e19c5
fixed the key issue that caused appearance to go wonky
2008-05-15 21:14:42 +00:00
4a9ee9f870
testing avatar appearance as a user service
2008-05-15 20:25:42 +00:00
4ff4475d02
remove my UserAppearance object, switch all code to use
...
AvatarAppearance instead.
2008-05-15 18:42:27 +00:00
b1327dda01
fix for a change in inventory that meant I was returning a lot
...
of empty inventory folders
2008-05-14 15:43:19 +00:00
b7a0855c3a
More formatting cleanup. Minor refactoring.
2008-05-14 06:09:39 +00:00
6a1b787436
More formatting cleanup.
2008-05-14 05:33:32 +00:00
c995d60d37
Formatting cleanup.
2008-05-14 05:11:23 +00:00
4fa0cbdfbb
* You can haz more spring cleaning.
...
* Eventually this codebase will be clean. >_>
2008-05-08 05:35:01 +00:00
ba8ff761c0
* Reduced sleep durations in a number of files.
2008-05-08 04:47:38 +00:00
5843f595a7
* Fixed some compiler warnings
...
* Fixed prebuild.xml to remove DB4o references (more compiler warnings)
2008-05-07 21:42:23 +00:00
0ea48cf786
De-tabify source.
2008-05-06 22:41:38 +00:00
94a3442baf
this should fix zariok's issue
2008-05-06 19:22:05 +00:00
7b446aba91
* Implemented DIE_AT_EDGE and Temporary objects don't save to the database.
2008-05-04 22:55:52 +00:00
e538a34acc
fixed up a bunch of the nhibernate user driver. Friends are not
...
implemented, and something is still funny with agents, but this
at least got me logged in, so is good enough to plumb through
appearance and see how that goes.
2008-05-02 19:57:35 +00:00
17496f3edf
in theory fix the user table mapping
2008-05-02 19:39:27 +00:00
260927bf68
move it out of the Types namespace
2008-05-02 19:31:41 +00:00
286d681673
in theory this gives me a back end that will do persistance
...
to actually have something to test plumbing in appearance
saving.
2008-05-02 19:16:54 +00:00
1b7f1c956c
plumb in connection string to the user database paths. mysql and mssql
...
just ignore this for now, but it lets us get connect strings to sqlite
and nhibernate.
2008-05-02 18:59:12 +00:00
72a7c2e2bb
added user appearance mapping in nhibernate
2008-05-02 18:39:13 +00:00
4a8f432441
minor refactoring. Change getName and GetVersion methods (yes the had different casings)
...
to Name and Version properties for the User stores.
2008-05-02 12:35:24 +00:00
1de6cffa28
* Refactor: Remove the unused userID parameter that was being passed into almost every inventory method
...
* This allows lots of redundant inventory methods with only slightly different names to be eliminated.
2008-05-01 20:47:33 +00:00
62c663c37b
remove DB4o, we're pretty sure no one uses this, and
...
no core developer supports it anyway.
2008-05-01 20:17:57 +00:00
86d2e53d1f
added stubs for appearance bits to all the db layers
2008-05-01 20:16:26 +00:00
76d8eaa406
* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.
2008-05-01 18:50:44 +00:00
20a9bf08f5
* Rolled back a few changes.
2008-05-01 18:04:42 +00:00
fc6c4dc399
* Cleaning code still.
2008-05-01 16:41:01 +00:00
01f31fd933
* Breaking all the code, breaking all the code..!
...
* Made a bunch more members static, removed some dead code, general cleaning.
2008-05-01 16:23:53 +00:00
5231903778
* In ur code. Making it static.
...
* Converted a bunch of functions to static functions.
2008-05-01 16:03:53 +00:00
a1c8aa4050
* Cleaned namespaces of entire solution. OpenSim directories now correspond with namespaces.
2008-05-01 15:36:39 +00:00
4692e92312
* Assorted spring cleanings.
2008-05-01 14:45:56 +00:00
d51ce47b2d
Update svn properties. Minor formatting cleanup.
2008-05-01 14:31:30 +00:00
13e51b197c
* Add more class cast exceptions to mysql read inventory item to cover all new fields - not just those I think are initially failing.
...
* This is more likely to allow existing mysql databases to work temporarily, if the previous revision doesn't work
2008-05-01 13:41:36 +00:00
d72bdf432a
* Align new fields upgrade sql to have the same 'not null' and default settings as when an inventoryitems table is newly created
...
* Normalize logging titles in database code, though this doesn't yet cover invoking code
2008-05-01 13:27:40 +00:00
6e9042c3d3
* Change mysql inventory items table version 3 upgrade sql to provide explicit default values
2008-05-01 12:33:05 +00:00
9024fe68fc
* Insert temporary cast exception catching code to deal with mantis 1099 - mysql inventoryitems table problem
2008-05-01 12:08:22 +00:00
4dfc9bdd0b
* Whoops, SQLite land data malfunction. Fixed.
2008-05-01 00:40:47 +00:00
25a49ac4de
* Spring cleaned a bunch of '//TODO: unused' marked functions.
2008-04-30 23:11:07 +00:00
19723767a9
* Adds the AuthbuyerID field to sqlite and makes use of it.
...
* Includes a more user-friendly way of adding it saying, 'Your land table was recently updated. You need to restart the simulator. Exiting'
2008-04-30 21:15:48 +00:00
b3f44fbb94
* Refactored the land table to be versionable in mySQL.
...
* Added AuthbuyerID so that if someone sets a land for sale to someone and then restarts the simulator, when the simulator comes back up, the setting persists.
2008-04-30 20:08:15 +00:00
8ed9e57896
* Add a scratch implementation of the new inventory fields to the mssql database adapter
...
* I don't use mssql so this may not work, corrections (in the form of patches) are welcome.
* Unlike mysql, mssql requires manual updating of existing tables here (which should mean just adding the new fields manually)
2008-04-30 19:28:36 +00:00
f57ff4c36b
* Change new inventory groupID field to 36 rather than 63
...
* Add updated stub mssql inventory sql (only really because I was in the middle of this when I spotted the numeric transposition)
2008-04-30 19:13:06 +00:00
dbcd6112b9
* Actually enable the inventory upgrade sql if appropriate
2008-04-30 17:11:59 +00:00
b70da6ac19
* Patch by Melanie. Implements proper objectflags on child objects. Thanks Melanie!
...
RE: 0001079: r4387. touch() event does not fire when touch script is in root prim and child prims are touched
2008-04-30 16:52:12 +00:00
eac3fd51f0
* Deal with a situation where the new fields in the inventory store are null on sqlite
...
* This is due to a preparatory change I made yesterday
2008-04-30 16:41:05 +00:00
f3b44deeee
* Trivial sqlite inventory db log message change so I can pick out the messages more easily
2008-04-30 16:28:29 +00:00
a9cc76e0ef
* Long awaited patch from A_Biondi Mantis 923. Kept alive by Melanie. Thanks A_Biondi and Melanie!
...
* This builds but might not work. JustinCC will examine.. it may work out of the box.
2008-04-30 16:08:24 +00:00
41207b5fa0
* Preparatory work for autoupgrade of sqlite inventory tables in preparation for patches in mantis #923
2008-04-29 17:21:17 +00:00
03c7055902
do a max of 3 splits when first processing the nhibernate connect
...
strings so the ; in the db connect strings pass to the native
drivers correctly
2008-04-24 15:52:22 +00:00
c6f6218f60
in theory, let you pass the mysql connection string into the
...
mysql manager class. This could use some testing of inventory
and asset services. Once this is prooved out, I'll do it for
mssql as well.
2008-04-24 15:23:49 +00:00
56ef67ec6d
auto table creation for nhibernate backends
2008-04-24 15:00:42 +00:00
3dd98a112f
allow for Inventory database source to be specified in main
...
configs. This works with sqlite and nhibernate backends, and
stays with default seperate ini files for mysql and mssql until
someone writes those.
2008-04-23 20:48:23 +00:00
a1cc0e436f
changes to allow asset_source to be specified in the opensim.ini
...
this will work for sqlite and nhibernate, but will be ignored for
mysql and mssql (reverting to their ini files) until someone writes
that bit.
2008-04-23 19:13:06 +00:00
4db839c3b8
* Implement proper emptying of trashcan on standalone
...
* On standalone, folders (and their items) should now be persistently deleted on trash emptying, as well as immediate child items
* An implementation for grid mode will follow.
2008-04-23 17:04:15 +00:00
fef3b36894
* Optimised using statements and namespace references across entire project (this took a while to run).
2008-04-21 07:09:17 +00:00
f0896c263b
* Insert some missing database locks for inventory and user data on mysql
2008-04-18 22:46:03 +00:00
fe3265f491
Update svn properties. Add copyright info to some source files.
2008-04-17 12:16:19 +00:00
3891b2f86f
fix types on nhibernate mappings for User bits
2008-04-15 23:01:42 +00:00
379ac9c92a
* Make it easier to follow logins on the user server by changing and tidying up log messages
2008-04-15 22:41:34 +00:00
e46454afa6
first drop of user storage implementation for nhibernate.
...
This surely doesn't work yet, but it compiles, and I'm getting
close to a stopping point for the day.
2008-04-11 23:10:12 +00:00
b43ffd12f5
add user agent mapping
2008-04-11 22:18:52 +00:00
cbf9fcfac5
* Discerned between AddProfile and UpdateProfile in region registration
...
:: Believe it or not, but INSERT/UPDATE is actually a better pattern than REPLACE, since, with INSERT/UPDATE you can catch erroneous UPDATES to non-INSERTed items as well as catch erroneous re-INSERTS. in 95% of the cases, you SHOULD have a clear INSERT context, and a clear and separate UPDATE context. If you think your case falls within the 5%, maybe you should re-evaluate your code. ::
2008-04-11 09:56:22 +00:00
3f47deab32
add user profile mapping for nhibernate
2008-04-10 23:52:23 +00:00
55ac1c6dce
renaming of attributes in UserAgentData for readability
2008-04-10 14:50:52 +00:00
ef7dfae41c
changing UserAgentData to use properties. This caused more
...
grief than expected, as monodevelop doesn't like to refactor
properties of properties.
2008-04-10 14:37:17 +00:00
25fea01b92
further renaming of properties for clarity
2008-04-10 14:09:30 +00:00
c176caeb05
moved fields to properties for UserDataProfile, which was
...
actually a little more work than I expected given the copious
use of out params.
2008-04-10 13:53:06 +00:00
ce5e51240f
NHibernate Inventory support. Lightly tested, but seems to work
...
well enough on my test environment. Will need to add some exception
catching down the road.
On to User Store.
2008-04-09 18:04:03 +00:00
4cc3aad2f9
more futzing around here. None of this works yet because
...
bloody LLUUID isn't serializable, which is really annoying.
2008-04-09 16:01:57 +00:00
0919df5cdc
checking in a chunk of work because I think I'm tackling
...
the UUID issue
2008-04-09 14:15:54 +00:00
93d7c8bd31
oops, broke compile. This fixes it
2008-04-09 13:45:32 +00:00
ff2184136d
match file to classname
2008-04-09 13:44:28 +00:00
750291447e
changing around types a bit to make stuff more readable for
...
me.
2008-04-09 13:43:35 +00:00
ea16221c1b
NHibernate Inventory getting close, except for some of the
...
complex folder queries.
2008-04-09 02:08:07 +00:00
034255ac24
add a sample script for migrating from old inventory
2008-04-09 00:04:27 +00:00
960d57090f
fix up Inventory hbm definitions to work. Adding indexes in
...
NHibernate is quite nice (though there will still need to be a
db creator bit carved out later).
2008-04-08 23:44:52 +00:00
2aeeb4fe5f
move the mappings to .hbm.xml so NHibernate actually
...
sees them
2008-04-08 23:35:22 +00:00
6d6af55108
added the folder mappings
2008-04-08 23:34:51 +00:00
a6d27e0929
further refactor and rename of InventoryFolderBase properties
...
to reflect what they really are.
2008-04-08 23:26:31 +00:00
8c82117207
added migration script for SqliteAssets
2008-04-08 23:04:16 +00:00
d2744f5140
added Readme for migrations
2008-04-08 22:59:16 +00:00
214bd204b1
LLUUID mapper actually appears to work now with
...
NHibernate for Assets.
2008-04-08 13:49:10 +00:00
61daaa57a9
added mapping for InventoryItemBase
2008-04-08 03:09:56 +00:00
32b8dd70d6
attempt to introduce custom LLUUIDString type for
...
NHibernate
2008-04-08 02:50:44 +00:00
5ee75998ce
more refactoring, this time on InventoryFolderBase
...
* wrap attributes in properties
* clean up names a little bit
* clean up name styles
2008-04-07 23:27:05 +00:00
f436815107
Refactor InventoryItemBase to do the following:
...
* wrap fields as Properties
* rename some fields/properties to more sensible names
* set style to PropName to match more standard C# approach
2008-04-07 23:15:35 +00:00
bb2f163bf7
needed to add 4 characters to support the dashes
2008-04-07 23:03:09 +00:00
98b5276068
added swag #1 on Inventory NHibernate implementation. There
...
is no hbm.xml mapping yet, so this isn't going to do anything,
plus I'm sure I didn't get the list interfaces right. However
it now compiles, so worth getting into the tree.
2008-04-07 18:02:58 +00:00
c5804cbb3a
fix bad indentation
2008-04-07 17:58:20 +00:00
2b23734a16
add some error messages for abuse of our IInventoryData interface
...
(i.e. using add to update, or update to add).
2008-04-07 15:01:00 +00:00
5e32d86b87
move NullStorage => OpenSim.Data.Null to be consistant with
...
where other data storage assemblies are.
2008-04-03 21:07:03 +00:00
cd4348738a
Check in the remaining bits to do Asset store via NHibernate. Still
...
need to work out auto table creation in a reasonable way. Tommorrow
I'll work on getting the NHibernate bits in place to be able to put this
into the main tree.
2008-04-03 20:59:20 +00:00
4f174fbf57
Update svn properties.
2008-04-03 18:25:01 +00:00
fe14d65f07
point in time update of NHibernate Asset Mapping code
2008-04-03 12:29:25 +00:00
1379d1bef8
remove really odd utf character at the front of this class
2008-04-02 18:20:48 +00:00
fbc6c16fd7
starting to stub out NHibernate data source. This isn't in
...
prebuild yet so it's currently dead code in tree, and shouldn't
bother anyone. Once this does *something* I'll add it into the
main build. However it seemed like a good idea to commit work
as I go for people interested in it.
2008-04-02 18:12:33 +00:00
30ea28c3b1
fix ups to include OpenSim.Framework explicit includes (they
...
were implicitly included before). Everything builds again.
Now off to testing.
2008-04-02 16:00:40 +00:00
849592391a
move signing file
2008-04-02 15:41:30 +00:00
f52c8f3970
attempt to fix up all refernces to new directory structure
2008-04-02 15:36:01 +00:00
c52c68f314
whole lot more moving
2008-04-02 15:24:31 +00:00
35420b21a3
reorganizing namespaces to put all the Data stuff into it's own namespace
...
/ dir structure. This is coming in over a few changesets so consider trunk
broken for the next 30 minutes as these get pulled together.
2008-04-02 15:22:39 +00:00
Adam Frisby