diff options
| author | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
| commit | e371d3208cdda87f8ea86adb591ed6225f0aa442 (patch) | |
| tree | f481acfbafcb7134c00ff519c0c12b41e7815d02 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Logins work now, but avatars are green ugly gnomes. (diff) | |
| download | opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.zip opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.gz opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.bz2 opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index c88e0d1..c9d4c93 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -69,6 +69,6 @@ namespace OpenSim | |||
| 69 | /// of the code that is too old. | 69 | /// of the code that is too old. |
| 70 | /// | 70 | /// |
| 71 | /// </value> | 71 | /// </value> |
| 72 | public readonly static int MajorInterfaceVersion = 6; | 72 | public readonly static int MajorInterfaceVersion = 7; |
| 73 | } | 73 | } |
| 74 | } | 74 | } |