| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 6 | -1/+746 | |
| |\ \ | |/ | ||||||
| | * | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 | |
| | | | ||||||
| | * | First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵ | Diva Canto | 2013-02-19 | 2 | -0/+599 | |
| | | | | | | | | | rest to Addons.Groups.dll. | |||||
| | * | Offline IM: moved the Data and MySQL bits to the corresponding places in ↵ | Diva Canto | 2013-02-19 | 2 | -0/+86 | |
| | | | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. | |||||
| | * | I need these for OfflineIM and Groups. | Diva Canto | 2013-02-18 | 1 | -0/+60 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 2 | -6/+18 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||||
| | * | Added physics parameters support to MSSQL and SQLite (not tested) | Oren Hurvitz | 2013-02-09 | 2 | -10/+11 | |
| | | | ||||||
| | * | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 1 | -2/+2 | |
| | | | ||||||
| | * | Fix a bug I brought in by manually editing a diff file. Terrain is if cource ↵ | Melanie | 2013-02-06 | 1 | -1/+1 | |
| | | | | | | | | | not always at 20m. | |||||
| | * | Partial port of Avination's support for the new physics parameters. | Melanie | 2013-02-06 | 2 | -18/+51 | |
| | | | | | | | | | | | | | | | | | 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. | |||||
| * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 3 | -4/+23 | |
| |\ \ | |/ | | | | | | | | | | | | | 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 | |||||
| | * | Merge branch 'dynamic-attributes2' | Justin Clark-Casey (justincc) | 2013-02-05 | 2 | -3/+24 | |
| | |\ | ||||||
| | | * | Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic ↵ | Oren Hurvitz | 2013-01-25 | 1 | -1/+5 | |
| | | | | | | | | | | | | | attributes | |||||
| | | * | Stopped storing dynamic attributes in the PrimShape | Oren Hurvitz | 2013-01-25 | 2 | -9/+2 | |
| | | | | ||||||
| | | * | Added missing DynAttrs references in MySQL | Oren Hurvitz | 2013-01-25 | 1 | -3/+6 | |
| | | | | ||||||
| | | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual | |||||
| | | * | Implement dynamic attribute persistence on mysql and mssql | Justin Clark-Casey (justincc) | 2013-01-25 | 2 | -2/+23 | |
| | | | | | | | | | | | | | mssql is untested | |||||
| | * | | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 | |
| | |/ | | | | | | | | | | | | | | | 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. | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Check database for root prim IDs only to try and get a handle on prim loss | Melanie | 2012-12-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | once and for all. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -0/+14 | |
| |\ \ \ | |/ / |/| / | |/ | ||||||
| | * | Restrict IPresenceData.VerifyAgent | BlueWall | 2012-12-09 | 1 | -3/+6 | |
| | | | | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result | |||||
| | * | Add agent verification to Presence | BlueWall | 2012-12-08 | 1 | -0/+11 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 1 | -42/+9 | |
| |\ \ | |/ | ||||||
| | * | refactor: move common inventory folder version update code to parent class ↵ | Justin Clark-Casey (justincc) | 2012-11-15 | 1 | -42/+9 | |
| | | | | | | | | | in mysql, mssql and sqlite database plugins | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵ | Diva Canto | 2012-11-13 | 1 | -1/+1 | |
| | | | | | | | | | have an AssemblyInfo file. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -2/+92 | |
| |\ \ | |/ | ||||||
| | * | Update parent inventory folder version numbers when folders are ↵ | Justin Clark-Casey (justincc) | 2012-11-09 | 1 | -2/+92 | |
| | | | | | | | | | | | | | | | | | 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. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-08 | 2 | -5/+76 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||||
| | * | Update folder version numbers when moving items and making the ↵ | Justin Clark-Casey (justincc) | 2012-11-06 | 2 | -4/+53 | |
| | | | | | | | | | | | | | | | | | 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. | |||||
| | * | Increment version number of a folder when an object it contains is deleted. | Justin Clark-Casey (justincc) | 2012-11-06 | 1 | -3/+25 | |
| | | | | | | | | | Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -2/+2 | |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵ | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -2/+2 | |
| | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 1 | -3/+0 | |
| |\ \ | |/ | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||||
| | * | Removed the bits about the TOSModule. That module doesn't go into core. ↵ | Diva Canto | 2012-09-27 | 1 | -3/+0 | |
| | | | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there. | |||||
| * | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 1 | -0/+8 | |
| |\ \ | |/ | ||||||
| | * | TOS module. WARNING: migration in GridUser table. | Diva Canto | 2012-09-25 | 1 | -0/+8 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -219/+238 | |
| |\ \ | |/ | | | | | | | | | | | | | 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 | |||||
| | * | Also do other MySQL region settings related calls under m_dbLock, in common ↵ | Justin Clark-Casey (justincc) | 2012-08-31 | 1 | -117/+130 | |
| | | | | | | | | | with other calls. | |||||
| | * | Do Windlight storage and removal calls in MySQL under m_dbLock, as is done ↵ | Justin Clark-Casey (justincc) | 2012-08-31 | 1 | -102/+108 | |
| | | | | | | | | | with all the other database calls. | |||||
| | * | Fix and finish the extra parameters storage system for MySQL | Melanie | 2012-08-15 | 1 | -1/+57 | |
| | | | ||||||
| | * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 2 | -0/+20 | |
| | | | ||||||
| * | | Fix and finish the extra parameters storage system for MySQL | Melanie | 2012-08-15 | 1 | -1/+57 | |
| | | | ||||||
| * | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 2 | -0/+20 | |
| | | | ||||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 1 | -2/+17 | |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | |||||
| | * | | Fix storing vehicle data | Melanie | 2012-07-07 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Add saving vehicle physics data to the database | Melanie | 2012-07-07 | 1 | -2/+17 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-06-29 | 1 | -26/+34 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |