diff options
| author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
| commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
| tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |
| parent | UbitOde: remove useless water collider from active code. (diff) | |
| parent | Merge branch 'avination' into careminster (diff) | |
| download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs index 45d6071..b3d61a8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |||
| @@ -106,7 +106,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 106 | "POST", | 106 | "POST", |
| 107 | "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath, | 107 | "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath, |
| 108 | new UploadBakedTextureHandler( | 108 | new UploadBakedTextureHandler( |
| 109 | caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture)); | 109 | caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture, |
| 110 | "UploadBakedTexture", | ||
| 111 | agentID.ToString())); | ||
| 110 | } | 112 | } |
| 111 | } | 113 | } |
| 112 | } \ No newline at end of file | 114 | } \ No newline at end of file |