diff options
| author | Tom Grimshaw | 2010-06-12 04:36:14 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-12 04:36:14 -0700 |
| commit | 63531b1df5463d43821c91a26bd0f6414716d0d0 (patch) | |
| tree | 381fddf86dbe4880b6e5114f3db8737fc9ecb53a /OpenSim/Framework | |
| parent | Get rid of spamming SOG debug message (diff) | |
| parent | Preserving the link numbers is a serializer's highest duty. (diff) | |
| download | opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.zip opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.gz opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.bz2 opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 71174d2..d85b101 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1310,5 +1310,7 @@ namespace OpenSim.Framework | |||
| 1310 | 1310 | ||
| 1311 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); | 1311 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); |
| 1312 | void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId); | 1312 | void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId); |
| 1313 | |||
| 1314 | void StopFlying(ISceneEntity presence); | ||
| 1313 | } | 1315 | } |
| 1314 | } | 1316 | } |
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 518f2ea..f3ac191 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -29,7 +29,7 @@ namespace OpenSim | |||
| 29 | { | 29 | { |
| 30 | public class VersionInfo | 30 | public class VersionInfo |
| 31 | { | 31 | { |
| 32 | private const string VERSION_NUMBER = "0.7CM"; | 32 | private const string VERSION_NUMBER = "0.7.1CM"; |
| 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
| 34 | 34 | ||
| 35 | public enum Flavour | 35 | public enum Flavour |