diff options
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index 6df5cc2..093ea9c 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | |||
@@ -44,14 +44,13 @@ namespace OpenSim.Region.Framework.Interfaces | |||
44 | /// <param name='isReuseable'></param> | 44 | /// <param name='isReuseable'></param> |
45 | void ReturnData(UUID id, IDynamicTexture texture); | 45 | void ReturnData(UUID id, IDynamicTexture texture); |
46 | 46 | ||
47 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams); | ||
47 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, | 48 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, |
48 | int updateTimer); | 49 | bool SetBlending, byte AlphaValue); |
49 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, | 50 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, |
50 | int updateTimer, bool SetBlending, byte AlphaValue); | 51 | bool SetBlending, int disp, byte AlphaValue, int face); |
51 | UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, string extraParams, | 52 | |
52 | int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face); | 53 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams); |
53 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, | ||
54 | int updateTimer); | ||
55 | 54 | ||
56 | /// Apply a dynamically generated texture to all sides of the given prim. The texture is not persisted to the | 55 | /// Apply a dynamically generated texture to all sides of the given prim. The texture is not persisted to the |
57 | /// asset service. | 56 | /// asset service. |
@@ -62,8 +61,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
62 | /// based texture or "image" to create a texture from an image at a particular URL</param> | 61 | /// based texture or "image" to create a texture from an image at a particular URL</param> |
63 | /// <param name="data">The data for the generator</param> | 62 | /// <param name="data">The data for the generator</param> |
64 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> | 63 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> |
65 | /// <param name="updateTimer">If zero, the image is never updated after the first generation. If positive | ||
66 | /// the image is updated at the given interval. Not implemented for </param> | ||
67 | /// <param name="SetBlending"> | 64 | /// <param name="SetBlending"> |
68 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim | 65 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim |
69 | /// </param> | 66 | /// </param> |
@@ -76,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
76 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID | 73 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID |
77 | /// </returns> | 74 | /// </returns> |
78 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, | 75 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, |
79 | int updateTimer, bool SetBlending, byte AlphaValue); | 76 | bool SetBlending, byte AlphaValue); |
80 | 77 | ||
81 | /// <summary> | 78 | /// <summary> |
82 | /// Apply a dynamically generated texture to the given prim. | 79 | /// Apply a dynamically generated texture to the given prim. |
@@ -87,8 +84,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
87 | /// based texture or "image" to create a texture from an image at a particular URL</param> | 84 | /// based texture or "image" to create a texture from an image at a particular URL</param> |
88 | /// <param name="data">The data for the generator</param> | 85 | /// <param name="data">The data for the generator</param> |
89 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> | 86 | /// <param name="extraParams">Parameters for the generator that don't form part of the main data.</param> |
90 | /// <param name="updateTimer">If zero, the image is never updated after the first generation. If positive | ||
91 | /// the image is updated at the given interval. Not implemented for </param> | ||
92 | /// <param name="SetBlending"> | 87 | /// <param name="SetBlending"> |
93 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim | 88 | /// If true, the newly generated texture is blended with the appropriate existing ones on the prim |
94 | /// </param> | 89 | /// </param> |
@@ -109,10 +104,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
109 | /// to obtain it directly from the SceneObjectPart. For instance, if ALL_SIDES is set then this texture | 104 | /// to obtain it directly from the SceneObjectPart. For instance, if ALL_SIDES is set then this texture |
110 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID | 105 | /// can be obtained as SceneObjectPart.Shape.Textures.DefaultTexture.TextureID |
111 | /// </returns> | 106 | /// </returns> |
112 | UUID AddDynamicTextureData( | 107 | UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, string extraParams, |
113 | UUID simID, UUID primID, string contentType, string data, string extraParams, | 108 | bool SetBlending, int disp, byte AlphaValue, int face); |
114 | int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face); | 109 | |
115 | |||
116 | void GetDrawStringSize(string contentType, string text, string fontName, int fontSize, | 110 | void GetDrawStringSize(string contentType, string text, string fontName, int fontSize, |
117 | out double xSize, out double ySize); | 111 | out double xSize, out double ySize); |
118 | } | 112 | } |
@@ -140,7 +134,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
140 | bool AsyncConvertUrl(UUID id, string url, string extraParams); | 134 | bool AsyncConvertUrl(UUID id, string url, string extraParams); |
141 | bool AsyncConvertData(UUID id, string bodyData, string extraParams); | 135 | bool AsyncConvertData(UUID id, string bodyData, string extraParams); |
142 | 136 | ||
143 | void GetDrawStringSize(string text, string fontName, int fontSize, | 137 | void GetDrawStringSize(string text, string fontName, int fontSize, |
144 | out double xSize, out double ySize); | 138 | out double xSize, out double ySize); |
145 | } | 139 | } |
146 | 140 | ||