diff options
| author | Melanie | 2013-01-10 01:25:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-10 01:25:07 +0000 |
| commit | aecb32b74efa5b74adcfc026f7261f43ad5934f4 (patch) | |
| tree | 8c775eca7460a5c5c2bc08e25d2334897e693673 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Change IsRoot to use ReferenceEquals to prevent operator == messiness (diff) | |
| download | opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.zip opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.gz opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.bz2 opensim-SC_OLD-aecb32b74efa5b74adcfc026f7261f43ad5934f4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs index d63898a..21ed44f 100644 --- a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs | |||
| @@ -13,7 +13,7 @@ namespace OpenSim.Services.Interfaces | |||
| 13 | { | 13 | { |
| 14 | public interface IBakedTextureModule | 14 | public interface IBakedTextureModule |
| 15 | { | 15 | { |
| 16 | AssetBase[] Get(UUID id); | 16 | WearableCacheItem[] Get(UUID id); |
| 17 | void Store(UUID id, AssetBase[] data); | 17 | void Store(UUID id, WearableCacheItem[] data); |
| 18 | } | 18 | } |
| 19 | } | 19 | } |