aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/VersionInfo.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-071-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-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-311-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-301-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 careminsterMelanie2012-03-031-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.4Justin Clark-Casey (justincc)2012-02-291-1/+1
| |
* | Adjust CM version tagMelanie2011-10-121-1/+1
| |
* | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * flip master version up to 0.7.3Justin Clark-Casey (justincc)2011-10-071-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-251-1/+1
|\ \ | |/
| * Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
| |
| * Revert master version number to 0.7.1 for now to make merging easier.Justin Clark-Casey (justincc)2011-04-071-1/+1
| |
| * bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes ↵Justin Clark-Casey (justincc)2011-04-061-1/+1
| | | | | | | | branch now exists.
* | Change "OpenSim" to "Careminster" and remove CM suffix.Melanie2010-11-091-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-1/+1
|\ \ | |/
| * READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-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-refactorMelanie2010-09-131-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-101-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 flavorMelanie2010-06-151-2/+2
| |
| * Change flavor to 0.7-RC1Melanie2010-06-121-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\ \ | | | | | | | | | 0.7.1CM Dev
| * | Change trunk versio to 0.7.1 DevMelanie2010-06-121-2/+2
| |/
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-1/+1
|\ \
| * | Test commitMelanie Thielker2010-04-051-1/+1
| | |
| * | Bump version numberMelanie Thielker2010-04-051-1/+1
| | |
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-051-0/+1
|\ \ \ | |/ /
| * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-051-0/+1
| |\ \
| | * | switch flavor to RC1Justin Clark-Casey (justincc)2010-03-261-1/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-301-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | change trunk version to 0.7.DevJustin Clark-Casey (justincc)2010-03-261-2/+2
| |/
* | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THISMelanie2009-12-251-1/+1
| | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always.
* | Restore version suffix.Melanie2009-12-251-1/+1
| |
* | Recover out-of-region objects during db load.Kitto Flora2009-12-241-1/+1
| |
* | Fix mantis #10 & #14Kitto Flora2009-12-191-1/+1
| |
* | Fix version numberMelanie2009-12-101-4/+3
| |
* | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-051-4/+4
| | | | | | | | spammy debug messages in Interregion....
* | Update CM versionMelanie2009-11-261-1/+1
|/
* Bump trunk version number to 0.6.9.Justin Clark-Casey (justincc)2009-11-261-1/+1
| | | | This is a place holder name and not necessarily the version number that will be used
* Remove the "mel_t" from version stringMelanie2009-10-221-1/+1
|
* Mark new versionMelanie2009-10-221-1/+1
|
* Formatting cleanup.Jeff Ames2009-10-011-1/+1
|
* Formatting cleanup.Jeff Ames2009-10-011-1/+1
|
* Bump main version to 0.6.8-DevMelanie2009-09-281-1/+1
|
* Remove The legacy inventory and asset servers. Bump interface version to 6Melanie2009-09-171-1/+1
|
* * as per my e-mail to opensim-dev archive: ↵Teravus Ovares2009-07-251-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 Ames2009-07-151-1/+1
|
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* * We have strand flavours.lbsa712009-05-261-6/+9
| | | | | | * The version string is now reported as "OpenSim 0.6.5 (Dev)" * This has to be administrated manually.
* * Introduced GetVersionString so we can harness the whole thing.lbsa712009-05-261-1/+15
| | | | | * Introduced 'Flavour' to spice things up.
* * slowly getting there...lbsa712009-05-261-12/+7
|