ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-21 04:55:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,699 Commits 5 Branches 106 Tags
d8c27de39596e1ec18c2e239d552dcc6787f4477
Commit Graph

73 Commits

Author SHA1 Message Date
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Oren Hurvitz
86802bcf93 Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes 2013-01-25 04:03:24 +00:00
Oren Hurvitz
fdec05a15e Stopped storing dynamic attributes in the PrimShape 2013-01-25 04:03:20 +00:00
Oren Hurvitz
918b062866 Added missing DynAttrs references in MySQL 2013-01-25 04:03:15 +00:00
Justin Clark-Casey (justincc)
a6d9c26365 Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it 
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
 2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc)
a3e1e6dd61 Implement dynamic attribute persistence on mysql and mssql 
mssql is untested
 2013-01-25 04:03:09 +00:00
Melanie
8e6bc55470 Check database for root prim IDs only to try and get a handle on prim loss 
once and for all.
 2012-12-09 23:25:07 +01:00
Melanie
1b15144208 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-08-31 01:32:18 +01:00
Justin Clark-Casey (justincc)
3bd3f448a2 Also do other MySQL region settings related calls under m_dbLock, in common with other calls. 2012-08-31 00:33:06 +01:00
Justin Clark-Casey (justincc)
7c6e8fab15 Do Windlight storage and removal calls in MySQL under m_dbLock, as is done with all the other database calls. 2012-08-31 00:29:57 +01:00
Melanie
c7f2debd38 Fix and finish the extra parameters storage system for MySQL 2012-08-15 18:58:32 +01:00
Melanie
de21929426 Fix and finish the extra parameters storage system for MySQL 2012-08-15 18:21:28 +02:00
Melanie
dc82ad0f7a Add a skeleton for a name value storage associated with regions 2012-08-15 02:06:22 +01:00
Melanie
7d1bec00d5 Add a skeleton for a name value storage associated with regions 2012-08-15 01:08:30 +02:00
Melanie
89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +01:00
Melanie
3024bdd097 Fix storing vehicle data 2012-07-07 02:29:21 +02:00
Melanie
6535f23e4b Add saving vehicle physics data to the database 2012-07-07 02:05:01 +02:00
Melanie
05cf51cbbd Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
 2012-06-29 22:11:49 +01:00
Melanie
fcb34efa95 Prevent bad prim in the database from crashing the sim, list affected 
ids and skip them.
 2012-06-26 10:47:35 +02:00
Melanie
84377a23db Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
 2012-06-11 16:56:40 +01:00
Melanie
b700f58d5e Typo fix 2012-06-07 23:41:00 +02:00
Melanie
26c5b32988 Add the ability to query the MYSQL databse for a list of the stored prim UUIDs 2012-06-07 22:39:03 +02:00
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-05-27 19:24:30 +01:00
PixelTomsen
bc543c1797 Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite 
enable/disable this module:
Cap_EnvironmentSettings = "localhost" (for enable)
Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file)
 or owerwrite in OpenSim.ini

mantis: http://opensimulator.org/mantis/view.php?id=5860

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-05-23 17:04:19 -04:00
Melanie
81ce169dfe Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-05-15 21:24:27 +01:00
Melanie
995cd25f30 Port the mel/dahlia fix 2012-05-15 02:36:11 +02:00
Melanie
4b982db252 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/MySQLUserAccountData.cs
 2012-04-30 19:04:38 +01:00
Justin Clark-Casey (justincc)
4ad45934c6 If there are no new prim items to store then don't bother opening the MySqlConnection only to do nothing with it. 2012-04-30 16:00:31 +01:00
Justin Clark-Casey (justincc)
522eff6138 Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done. 2012-04-30 15:54:35 +01:00
Melanie
abd9957198 Fix an invalid cast that only showed at runtime 2012-03-20 12:24:42 +01:00
Melanie
7779b1eabc Store and reload extra physics from database 2012-03-20 12:04:55 +01:00
Melanie
182f5efbe9 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-04 16:23:46 +00:00
Melanie
1f32730798 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-03-03 09:58:57 +00:00
Justin Clark-Casey (justincc)
40c838896c Use correct casing of RegionSettings.Sandbox in the various database modules. 
MySQL and MSSQL have it as Sandbox, sqlite as sandbox.
In various different places in every plugin the wrong casing is used...
Consistency, who needs it?  Or one day sqlite can change to Sandbox.
 2012-02-29 00:33:17 +00:00
Melanie
fca8c82232 Move KeyframeMotion from SOG to SOP because we can't persist it any 
other way because SOG doesn't technically exist in the DB
 2012-02-26 18:11:38 +01:00
Melanie
ce5e900721 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-02-04 11:48:20 +00:00
PixelTomsen
5c545d1d2e Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-02-03 18:02:51 -05:00
Melanie
447a66d660 Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more 
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
 2012-02-02 23:40:56 +00:00
Melanie
07c487a28f Make ban, eject, freeze and the scripted versions of those work. 2012-02-02 21:36:45 +01:00
Melanie
1b600e7803 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-01-30 16:38:11 +00:00
Melanie
3de534896e Add ParcelImageID to RegionSettings so we can have that overlay. 
Warning: Contains a Migration.
Warning: May contain nuts.
 2012-01-30 16:22:21 +00:00
Melanie
8fcb9bf418 Correct some SQL syntax 2012-01-24 00:57:52 +00:00
Melanie
7a87be5015 Fix merge artefacts and build break 2012-01-24 00:45:17 +00:00
Melanie
7bb01a17ee Add a forgotten parameter 2012-01-24 00:38:00 +00:00
Melanie
07ad821157 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/RegionSettings.cs
 2012-01-24 00:36:42 +00:00
Melanie
87799c1f3d Change Telehubs to store only the data that is really needed and not 
additional redundant information.
 2012-01-24 00:32:10 +00:00
Melanie
cd2bf64b87 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-01-23 00:24:31 +00:00
Melanie
7c404375c7 Fix up some parameter naming 2012-01-22 23:20:10 +00:00
BlueWall
74c1ed77a4 Finish connecting Telehub to database 2012-01-22 14:51:15 -05:00
BlueWall
1cd26ba85e Hooking up new telehub data to the database 2012-01-22 11:46:16 -05:00