diff options
| author | UbitUmarov | 2012-09-11 20:30:30 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-09-11 20:30:30 +0100 |
| commit | 245763b1b08d667aede3be7c092fa4c7200549c0 (patch) | |
| tree | 6a38b84b8c279f812e4e363e7e8375ae4557323f /OpenSim/Region/ClientStack | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| download | opensim-SC_OLD-245763b1b08d667aede3be7c092fa4c7200549c0.zip opensim-SC_OLD-245763b1b08d667aede3be7c092fa4c7200549c0.tar.gz opensim-SC_OLD-245763b1b08d667aede3be7c092fa4c7200549c0.tar.bz2 opensim-SC_OLD-245763b1b08d667aede3be7c092fa4c7200549c0.tar.xz | |
let LLSDAssetUploadRequest include asset_resources information plus let
NewAgentInventoryRequest know about mesh (does nothing with it still)
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 328dc75..df43991 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -431,6 +431,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 431 | 431 | ||
| 432 | if (llsdRequest.asset_type == "texture" || | 432 | if (llsdRequest.asset_type == "texture" || |
| 433 | llsdRequest.asset_type == "animation" || | 433 | llsdRequest.asset_type == "animation" || |
| 434 | llsdRequest.asset_type == "mesh" || | ||
| 434 | llsdRequest.asset_type == "sound") | 435 | llsdRequest.asset_type == "sound") |
| 435 | { | 436 | { |
| 436 | ScenePresence avatar = null; | 437 | ScenePresence avatar = null; |