| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+1 |
| |\ | |||||
| | * | Relocate one System.Core reference from last commit to the Tests project | justincc | 2010-08-06 | 1 | -1/+1 |
| | | | | | | | | | Ooops, shouldn't have assumed that the tests project came after the main on | ||||
| | * | Add System.Core references to OpenSim.Region.CoreModules.* to fix windows build | Justin Clark-Casey (justincc) | 2010-08-06 | 1 | -0/+2 |
| | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=4923 | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Implement media texture persistence over server restarts for sqlite | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | This is currently persisting media as an OSDArray serialized to LLSD XML. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-04 | 1 | -0/+52 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "remove long unused OpenSim/Framework/Configuration/* projects" | Melanie | 2010-08-04 | 1 | -0/+52 |
| | | | | | | | | | | | | | This reverts commit cdd3f17b2bee58def470635cfc06e26b0d0145b2. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 1 | -76/+0 |
| |\ \ \ | |/ / | |||||
| | * | | move ChannelDigger from its own project into the main terrain module with ↵ | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -24/+0 |
| | | | | | | | | | | | | | the rest of the effects | ||||
| | * | | remove long unused OpenSim/Framework/Configuration/* projects | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -52/+0 |
| | |/ | |||||
| * | | Add System.Core assembly reference to two projects so that TimeZoneInfo can ↵ | Tom Grimshaw | 2010-07-04 | 1 | -0/+2 |
| | | | | | | | | | be used | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 1 | -7/+0 |
| |\ \ | |/ | |||||
| | * | Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the | Melanie | 2010-06-01 | 1 | -7/+0 |
| | | | | | | | | | needed libraries | ||||
| * | | Revert "Meta7 Communities : Authorization service added, skeleton, not yet ↵ | Melanie Thielker | 2010-05-29 | 1 | -32/+0 |
| | | | | | | | | | | | | | functional" This reverts commit 31439293ccdb5df914dc13287a8f178529fccb6b. | ||||
| * | | Meta7 Communities : Authorization service added, skeleton, not yet functional | Tom Grimshaw | 2010-05-29 | 1 | -0/+32 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-26 | 1 | -70/+7 |
| |\ \ | |/ | |||||
| | * | Prebuild: removed DB-specific test projects, added refs to Data.Tests | AlexRa | 2010-05-23 | 1 | -70/+7 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case) | AlexRa | 2010-05-19 | 1 | -0/+2 |
| | | | |||||
| | * | Revert a revert? Am i mad? Don't answer that....! | Melanie | 2010-05-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | Revert "Revert "Looks like the new files were never added to prebuild.xml"" This reverts commit f253758c2e4e30c8e09f23135d79765c70198802. | ||||
| | * | Revert "Looks like the new files were never added to prebuild.xml" | Melanie | 2010-05-18 | 1 | -2/+0 |
| | | | | | | | | | This reverts commit df49756e7b8125595db20f63d5f9809a27642b77. | ||||
| | * | Looks like the new files were never added to prebuild.xml | Melanie | 2010-05-18 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -0/+1 |
| | |\ | |||||
| | * | | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 1 | -1/+38 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that ↵ | Diva Canto | 2010-04-26 | 1 | -2/+1 |
| | | | | | | | | | | | | | makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows. | ||||
| | * | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵ | Diva Canto | 2010-04-26 | 1 | -1/+3 |
| | |/ | | | | | | | | | | | in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from! * IRegionModule.cs wants to be committed too -- EOF. | ||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config. | Diva Canto | 2010-04-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | Include the library so that Windows builds correctly It appears that Windows is okay with either SQLite or SQLiteNG Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite | ||||
| | * | | Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -0/+37 |
| | |/ | | | | | | | shortly be changed to work under mono 2.6 and above | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -0/+2 |
| |\ \ | |/ | |||||
| | * | Adding the SimianGrid connectors | John Hurliman | 2010-03-11 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This ↵ | Diva Canto | 2010-03-04 | 1 | -2/+2 |
| | | | | | | | | | solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 1 | -44/+1 |
| |\ \ | |/ | |||||
| | * | * Added three new helper utility files to OpenSim.Framework. MultipartForm ↵ | John Hurliman | 2010-03-03 | 1 | -0/+1 |
| | | | | | | | | | is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams | ||||
| | * | Fixed prebuild errors that have emerged with the merge | Diva Canto | 2010-03-03 | 1 | -44/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 1 | -381/+128 |
| |\ \ | |/ | | | | | This brings careminster on the level of master. To be tested | ||||
| | * | Merge branch 'master' into presence-refactor | Melanie | 2010-03-02 | 1 | -29/+52 |
| | |\ | | | | | | | | | | | | | This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor branch remains for experimental work. | ||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-03-01 | 1 | -33/+18 |
| | | | | |||||
| | * | | Add the friends service skel and correct some namespace issues | Melanie | 2010-02-09 | 1 | -0/+31 |
| | | | | |||||
| | * | | Fixed missing System.Xml from the new tool. | Diva Canto | 2010-02-08 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 1 | -0/+26 |
| | |\ \ | | | | | | | | | | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | ||||
| | * | | | HG 1.5 is in place. Tested in standalone only. | Diva Canto | 2010-01-28 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Integrated the hyperlinking with the GridService. | Diva Canto | 2010-01-24 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Beginning of rewriting HG. Compiles, and runs, but HG functions not restored ↵ | Diva Canto | 2010-01-16 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | | yet. | ||||
| | * | | | Implement region registration with authentication | Melanie | 2010-01-15 | 1 | -0/+1 |
| | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |