ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-20 14:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,839 Commits 5 Branches 87 Tags
07b4889eab148efedb5ea554b2ed5eb4ca30752c
Commit Graph

835 Commits

Author SHA1 Message Date
Melanie
1f7a0cf892 Merge branch '0.6.9-post-fixes' into careminster 2010-03-06 12:24:09 +00:00
Jeff Ames
780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Justin Clark-Casey (justincc)
4355bcc417 Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily since it's making the tests fail but the cause is not obvious (wrapped up in layers of reflection) 2010-02-16 19:31:49 +00:00
Melanie
2084e08ad7 Merge branch 'master' into careminster 2010-02-14 22:27:39 +00:00
Teravus Ovares (Dan Olivares)
45493171b0 * SQLite match code casing with regionsettings table field casing (what's with the upper case S in Sandbox while the rest is lower case 0.o) 
* It's doubtful that this will have any effect on mantis http://opensimulator.org/mantis/view.php?id=4577 .   Sqlite 3 is required, Sqlite 2 was reported.
 2010-02-13 05:50:57 -05:00
Teravus Ovares (Dan Olivares)
fa6da2f6c6 * This is an attempt to resolve mantis 4437 by using SqliteAdapter type statements instead of blanket SQL statements. The hope is that this makes SQLite work on Linux/Mono again. Re: http://opensimulator.org/mantis/view.php?id=4437 
* Added a 'Create Update Statement' method that takes two fields for a primary key
* Added an Update and Delete command for parcels and land access list table rows.
 2010-02-13 05:09:15 -05:00
Justin Clark-Casey (justincc)
802a969267 Fix http://opensimulator.org/mantis/view.php?id=4224 
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache.  However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
 2010-02-12 21:32:03 +00:00
Melanie
0ad8046582 Resolve a merge issue 2010-02-08 22:44:17 +00:00
Melanie
c8f3bb56ff Merge branch 'master' into careminster 2010-02-08 22:11:38 +00:00
Master ScienceSim
e1b5c61247 Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way. 2010-02-05 18:07:59 -08:00
OpenSim Master
5f1f5c29e9 Fixing an incorrect logging message in insertUserRow 2010-02-05 18:06:01 -08:00
OpenSim Master
3e697ad57e * Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null 2010-02-05 18:05:57 -08:00
Melanie
776d62b9c6 Merge branch 'master' into careminster 2010-02-04 17:29:33 +00:00
Justin Clark-Casey (justincc)
b9c3846e81 minor: remove some mono compiler warnings 2010-02-03 22:19:28 +00:00
Melanie
d22bdb5095 Merge branch 'master' into careminster 2010-01-09 12:02:48 +00:00
Melanie
28ba16ee53 Add the port of the XInventoryService for the new Sqlite framework 2010-01-05 00:35:54 +00:00
Melanie
033a3da254 Sqlite framework and generic handler. They compile. More I cannot say. 2010-01-04 23:30:38 +00:00
Melanie
1ae9bfc074 Finish conversion if XInventoryService 2010-01-04 20:53:28 +00:00
Melanie
e76333555d First stage port of the XInventoryService 2010-01-04 20:53:26 +00:00
Melanie
0907d5d69e Finish conversion if XInventoryService 2010-01-04 20:52:44 +00:00
Melanie
53d3f46add First stage port of the XInventoryService 2010-01-04 18:47:47 +00:00
Melanie
61ce884336 Merge branch 'master' into careminster 2010-01-03 21:43:39 +00:00
Jeff Ames
70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Melanie
0d9591bf35 Prevent the creation of duplicate inventory folders in the case of a login 
database issue. Now the login will instaead fail later.
 2010-01-01 22:51:00 +00:00
Melanie
61f63fdc38 Put PassCollision on the ignore list for testing, since we don't save that 
yet.
 2009-12-31 23:51:53 +00:00
root
a18f4964cf Correct some issues with the last commit 2009-12-27 01:32:23 +01:00
root
b7951d5177 Correct some issues with the last commit 2009-12-26 23:57:49 +00:00
Melanie
f5c310d9d4 Merge branch 'master' into careminster 2009-12-26 23:39:02 +00:00
Melanie
0369256720 Close a SQL injection loophole in the new database driver 2009-12-26 23:38:11 +00:00
root
43c303e27a Make the GenericTableHandler work as intended 2009-12-26 03:24:46 +01:00
root
92be01d5e6 Make the GenericTableHandler work as intended 2009-12-26 01:50:21 +00:00
Melanie
e51be5f4a7 Merge branch 'master' into careminster 2009-12-26 00:21:03 +00:00
Melanie
9972b12812 Add a generic REPLACE INTO handler for put into the generic table handler 2009-12-26 00:19:54 +00:00
CasperW
6dbe25360e Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. 2009-12-17 18:40:34 +01:00
Kitto Flora
0020afaf67 Merge branch 'master' into tests 2009-12-15 06:01:59 -05:00
Melanie
824d7190c2 Merge branch 'master' into careminster 2009-12-14 00:40:56 +00:00
Adam Frisby
963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level). 
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
 2009-12-13 03:04:16 +11:00
Kitto Flora
b056c243e4 Commit partial work because of repo change 2009-12-12 10:12:59 -05:00
Melanie
204c59c5ac Refix the fix 2009-12-11 02:42:05 +00:00
grid
d68b664243 Kill a NRE caused by an error message trying to print unavailable data 2009-12-11 02:42:00 +00:00
Melanie
f6b1344722 Refix the fix 2009-12-11 02:40:33 +00:00
grid
5ffd59e7b8 Kill a NRE caused by an error message trying to print unavailable data 2009-12-10 22:09:16 -05:00
unknown
d092977f4a Windlight configuration option in ini, and migration 2009-12-09 01:53:41 +01:00
unknown
e3f229225c Enable scripting interface for windlight 2009-12-09 01:34:26 +01:00
unknown
dbd8c400ce Merge branch 'careminster' into windlight 2009-12-07 18:14:02 +01:00
unknown
29a740ec8c Initial windlight codebase commit 2009-12-07 18:05:40 +01:00
Kunnis
4c61fcfc40 Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql. 
Signed-off-by: Melanie <melanie@t-data.com>
 2009-12-06 03:57:15 +00:00
Justin Clark-Casey (justincc)
c58d30616b Log old position and region information when an orphaned child prim is found 2009-12-02 18:54:24 +00:00
Justin Clark-Casey (justincc)
0f745e928f Apply patch that fixes the failing T013_eStateSettingsRandomStorage test 
See http://opensimulator.org/mantis/view.php?id=3993
Thanks Kunnis
 2009-11-27 18:52:20 +00:00
Adam Frisby
b516fe67a0 * Implements SQL Rollback support to Inventory Service for quicker backup restoration. 
* Can optionally replace the OpenGridMode committed earlier.
* Will create a series of incrementing restore SQL files, one per user, in folders listed per-day.
* For MySql Section of InventoryService INI:
rollback = "true"
rollbackdir = "/absolute/path/to/rollback/storage/dir"
 2009-11-23 17:20:03 +11:00