diff options
author | Melanie | 2009-11-18 06:20:21 +0000 |
---|---|---|
committer | Melanie | 2009-11-18 06:20:21 +0000 |
commit | 5d0778014df68b48abb08c8f63204cf7e077af7f (patch) | |
tree | 5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Region/Framework/Interfaces | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Change PresenceData to PresenceInfo to remove a naming conflict in the (diff) | |
download | opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.zip opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.gz opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.bz2 opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index 95f9cef..abcaf91 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | |||
@@ -30,10 +30,8 @@ using OpenMetaverse; | |||
30 | 30 | ||
31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | |||
34 | public interface IDynamicTextureManager | 33 | public interface IDynamicTextureManager |
35 | { | 34 | { |
36 | |||
37 | void RegisterRender(string handleType, IDynamicTextureRender render); | 35 | void RegisterRender(string handleType, IDynamicTextureRender render); |
38 | void ReturnData(UUID id, byte[] data); | 36 | void ReturnData(UUID id, byte[] data); |
39 | 37 | ||