ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-14 18:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,722 Commits 5 Branches 93 Tags
f94f6e77bf7c115b951a4a6810bf36020cd29168
Commit Graph

908 Commits

Author SHA1 Message Date
Diva Canto
3bc8017464 Recover a lost "virtual". Downstream projects need this. 2013-04-25 09:23:15 -07:00
Melanie
7cf377fff0 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-04-10 13:20:55 +01:00
Justin Clark-Casey (justincc)
e20b0d5695 minor: Make exceptions thrown by MySQLAssetData more consistent. 2013-04-10 00:03:37 +01:00
Melanie
b9146a7922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-15 23:45:32 +00:00
Justin Clark-Casey (justincc)
35843e8ec8 Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc. 
Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
 2013-03-15 23:42:16 +00:00
Justin Clark-Casey (justincc)
e9f3cd1a60 Implement access time updates on assets for XAssetService. 
This only happens if access time is older than 30 days currently, in order to reduce database updates.
The idea is to give some idea of assets which haven't been accessed for a very, very long time.
These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain.
This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself.
And many metadata entries may point to the same data.  Probably need to address this.
 2013-03-15 23:17:54 +00:00
Melanie
eb9458fd7e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2013-02-28 21:20:07 +00:00
Justin Clark-Casey (justincc)
74916ed777 Add more information to warnings logged when asset names and descriptions have to be truncated for database storage 
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are.
Even though they are never subsequently (inventory names/descriptions are always used instead).
 2013-02-27 21:35:54 +00:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Diva Canto
9380d01976 First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll. 2013-02-19 07:26:40 -08:00
Diva Canto
46e182dbf5 Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. 2013-02-19 06:37:20 -08:00
Diva Canto
8b1b8a3921 I need these for OfflineIM and Groups. 2013-02-18 12:08:05 -08:00
Melanie
069e587841 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
 2013-02-10 00:17:14 +00:00
Oren Hurvitz
85b81ff7f2 Added physics parameters support to MSSQL and SQLite (not tested) 2013-02-09 01:03:58 +00:00
Melanie
6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
Melanie
6504e3d4ce Rename "Bounciness" to "Restitution" 2013-02-07 03:30:02 +00:00
Melanie
054a9928a0 Fix a bug I brought in by manually editing a diff file. Terrain is if cource not always at 20m. 2013-02-06 18:13:02 +00:00
Melanie
e5beb480ea Partial port of Avination's support for the new physics parameters. 
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
 2013-02-06 08:03:04 +00:00
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
Justin Clark-Casey (justincc)
1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +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
79bdf464d3 Merge branch 'avination' into careminster 2012-12-18 09:48:12 +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
f30d519bcc Merge branch 'master' into careminster 2012-12-09 21:27:32 +00:00
BlueWall
8efae93b51 Restrict IPresenceData.VerifyAgent 
Restrict IPresenceData.VerifyAgent to only return bool result
 2012-12-09 15:08:32 -05:00
BlueWall
f85b23edea Add agent verification to Presence 2012-12-08 17:33:03 -05:00
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Justin Clark-Casey (justincc)
350cd58e5e refactor: move common inventory folder version update code to parent class in mysql, mssql and sqlite database plugins 2012-11-15 04:01:30 +00:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
e4cb7af98a Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file. 2012-11-13 19:26:43 -08:00
Melanie
415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
Justin Clark-Casey (justincc)
75c880a6f3 Update parent inventory folder version numbers when folders are moved/created/deleted to match version numbers cached by viewers. 
This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders).
This should hopefully improve viewer reuse of its cached inventory information.
Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
 2012-11-09 01:13:19 +00:00
Melanie
b3e99a4d48 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
 2012-11-08 04:51:00 +00:00
Justin Clark-Casey (justincc)
bf469819a6 Update folder version numbers when moving items and making the Delete(string[], string[]) call (not just string, string). 
This is to stop viewer inventory cache version numbers becoming out of sync with grid stored numbers when viewer performs these actions.
If there are no problems with these changes, they will be propogated to SQLite (and MSSQL if that's simple enough).
May also need to do the same on folder store/create/delete and maybe propogate version increments up the folder hierarchy, but that requires investigation.
 2012-11-06 23:44:52 +00:00
Justin Clark-Casey (justincc)
a8424490ae Increment version number of a folder when an object it contains is deleted. 
Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted.
 2012-11-06 23:40:33 +00:00
Melanie
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
73c9abf5f2 Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. 2012-10-09 01:35:27 +01:00
Melanie
71dd55a1ce Merge branch 'master' into careminster 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-09-29 19:21:07 +01:00
Diva Canto
7a50705188 Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there. 2012-09-27 16:43:18 -07:00
Melanie
637f5440fe Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster 2012-09-27 15:46:35 +01:00
Diva Canto
ae58cf4224 TOS module. WARNING: migration in GridUser table. 2012-09-25 20:03:49 -07: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