diff options
author | Tom Grimshaw | 2010-07-01 09:47:18 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-07-01 09:47:18 -0700 |
commit | 68281b356cea0ff92ae7d9484d663ea472d1be74 (patch) | |
tree | 108b5d48164e195fce67321aa8afdeada146b19b /OpenSim/Framework/ParcelMediaCommandEnum.cs | |
parent | Cache all assets on upload so that the client can still retrieve the asset if... (diff) | |
parent | ANother stab at LSL compatibility (diff) | |
download | opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.zip opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.gz opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.bz2 opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/ParcelMediaCommandEnum.cs')
-rw-r--r-- | OpenSim/Framework/ParcelMediaCommandEnum.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs index 93c41ec..e714382 100644 --- a/OpenSim/Framework/ParcelMediaCommandEnum.cs +++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | namespace OpenSim.Framework | 28 | namespace OpenSim.Framework |
29 | { | 29 | { |
30 | public enum ParcelMediaCommandEnum | 30 | public enum ParcelMediaCommandEnum : int |
31 | { | 31 | { |
32 | Stop = 0, | 32 | Stop = 0, |
33 | Pause = 1, | 33 | Pause = 1, |