| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | 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 | ||||
| | * | 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 'master' into careminster | Melanie | 2012-09-07 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs | ||||
| | * | Bump master code up to 0.7.5 now that 0.7.4 is out. | Justin Clark-Casey (justincc) | 2012-09-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 1 | -1/+2 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs | ||||
| | * | Add Extended flavour option to opensim version information. | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable. This flavour will almost certainly never see a formal release. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Flick master up to 0.7.4 | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -1/+1 |
| | | | |||||
| * | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Upped VERSION_NUMBER in master to 0.7.2. | Diva Canto | 2011-04-24 | 1 | -1/+1 |
| | | | |||||
| | * | Revert master version number to 0.7.1 for now to make merging easier. | Justin Clark-Casey (justincc) | 2011-04-07 | 1 | -1/+1 |
| | | | |||||
| | * | bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes ↵ | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -1/+1 |
| | | | | | | | | | branch now exists. | ||||
| * | | Change "OpenSim" to "Careminster" and remove CM suffix. | Melanie | 2010-11-09 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| | * | Remove parenthesis around the release flavour to get the version string back ↵ | Justin Clark-Casey (justincc) | 2010-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | under 27 chars Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client | ||||
| | * | Readjust master version and flavor | Melanie | 2010-06-15 | 1 | -2/+2 |
| | | | |||||
| | * | Change flavor to 0.7-RC1 | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | 0.7.1CM Dev | ||||
| | * | | Change trunk versio to 0.7.1 Dev | Melanie | 2010-06-12 | 1 | -2/+2 |
| | |/ | |||||
| * | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Test commit | Melanie Thielker | 2010-04-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | Bump version number | Melanie Thielker | 2010-04-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -0/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | switch flavor to RC1 | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| | * | | change trunk version to 0.7.Dev | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+2 |
| | |/ | |||||
| * | | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always. | ||||
| * | | Restore version suffix. | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | | |||||
| * | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fix mantis #10 & #14 | Kitto Flora | 2009-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Fix version number | Melanie | 2009-12-10 | 1 | -4/+3 |
| | | | |||||
| * | | Secnond revision of Sit and Stand for unscripted prims; Comment out | KittoFlora | 2009-12-05 | 1 | -4/+4 |
| | | | | | | | | | spammy debug messages in Interregion.... | ||||
| * | | Update CM version | Melanie | 2009-11-26 | 1 | -1/+1 |
| |/ | |||||
| * | Bump trunk version number to 0.6.9. | Justin Clark-Casey (justincc) | 2009-11-26 | 1 | -1/+1 |
| | | | | | This is a place holder name and not necessarily the version number that will be used | ||||
| * | Remove the "mel_t" from version string | Melanie | 2009-10-22 | 1 | -1/+1 |
| | | |||||
| * | Mark new version | Melanie | 2009-10-22 | 1 | -1/+1 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -1/+1 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -1/+1 |
| | | |||||
| * | Bump main version to 0.6.8-Dev | Melanie | 2009-09-28 | 1 | -1/+1 |
| | | |||||
| * | Remove The legacy inventory and asset servers. Bump interface version to 6 | Melanie | 2009-09-17 | 1 | -1/+1 |
| | | |||||
| * | * as per my e-mail to opensim-dev archive: ↵ | Teravus Ovares | 2009-07-25 | 1 | -1/+1 |
| | | | | | | | | | https://lists.berlios.de/pipermail/opensim-dev/2009-July/007223.html I'm bumping gridcomms interface version to 5. MajorInterfaceVersion = 5 | ||||
| * | Bump version in Framework/Servers/VersionInfo to 0.6.6. | Jeff Ames | 2009-07-15 | 1 | -1/+1 |
| | | |||||
| * | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 1 | -1/+1 |
| | | | | | LICENSE.txt. | ||||
| * | * We have strand flavours. | lbsa71 | 2009-05-26 | 1 | -6/+9 |
| | | | | | | | * The version string is now reported as "OpenSim 0.6.5 (Dev)" * This has to be administrated manually. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |