diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Framework/ParcelMediaCommandEnum.cs | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.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, |