diff options
| author | Melanie | 2010-08-10 19:49:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-10 19:49:35 +0100 |
| commit | c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928 (patch) | |
| tree | f78ebe5ce10d6b5efa0700e381e751296277b7e6 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Remove 4000+ DOS line endings. Grrr! (diff) | |
| parent | Changing prim color generates event CHANGED_COLOR. (diff) | |
| download | opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.zip opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.gz opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.bz2 opensim-SC-c2e5d1d20319be54e7cdc8ae1e5a82c640ea6928.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9d95324..3154872 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3560,11 +3560,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3560 | } | 3560 | } |
| 3561 | } | 3561 | } |
| 3562 | 3562 | ||
| 3563 | public override void SetText(string text, Vector3 color, double alpha) | ||
| 3564 | { | ||
| 3565 | throw new Exception("Can't set Text on avatar."); | ||
| 3566 | } | ||
| 3567 | |||
| 3568 | /// <summary> | 3563 | /// <summary> |
| 3569 | /// Adds a physical representation of the avatar to the Physics plugin | 3564 | /// Adds a physical representation of the avatar to the Physics plugin |
| 3570 | /// </summary> | 3565 | /// </summary> |