diff options
| author | Melanie | 2011-03-21 07:57:56 +0000 |
|---|---|---|
| committer | Melanie | 2011-03-21 07:57:56 +0000 |
| commit | e4f143fb1c9ef13b024a1ebe8be41ebee6476cac (patch) | |
| tree | 967eb3af6fd0c5a55997d31bc86c05c7375b18d7 /OpenSim/ApplicationPlugins | |
| parent | Don't send a windlight profile to clients if windlight is not set for (diff) | |
| parent | Upgrade SQLite: (diff) | |
| download | opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.zip opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.gz opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.bz2 opensim-SC_OLD-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index b415662..536f167 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
| @@ -2129,17 +2129,17 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 2129 | } | 2129 | } |
| 2130 | catch (DllNotFoundException) | 2130 | catch (DllNotFoundException) |
| 2131 | { | 2131 | { |
| 2132 | Rest.Log.ErrorFormat("OpenJpeg is not installed correctly on this system. Asset Data is emtpy for {0}", ic.Item.Name); | 2132 | Rest.Log.ErrorFormat("OpenJpeg is not installed correctly on this system. Asset Data is empty for {0}", ic.Item.Name); |
| 2133 | ic.Asset.Data = new Byte[0]; | 2133 | ic.Asset.Data = new Byte[0]; |
| 2134 | } | 2134 | } |
| 2135 | catch (IndexOutOfRangeException) | 2135 | catch (IndexOutOfRangeException) |
| 2136 | { | 2136 | { |
| 2137 | Rest.Log.ErrorFormat("OpenJpeg was unable to encode this. Asset Data is emtpy for {0}", ic.Item.Name); | 2137 | Rest.Log.ErrorFormat("OpenJpeg was unable to encode this. Asset Data is empty for {0}", ic.Item.Name); |
| 2138 | ic.Asset.Data = new Byte[0]; | 2138 | ic.Asset.Data = new Byte[0]; |
| 2139 | } | 2139 | } |
| 2140 | catch (Exception) | 2140 | catch (Exception) |
| 2141 | { | 2141 | { |
| 2142 | Rest.Log.ErrorFormat("OpenJpeg was unable to encode this. Asset Data is emtpy for {0}", ic.Item.Name); | 2142 | Rest.Log.ErrorFormat("OpenJpeg was unable to encode this. Asset Data is empty for {0}", ic.Item.Name); |
| 2143 | ic.Asset.Data = new Byte[0]; | 2143 | ic.Asset.Data = new Byte[0]; |
| 2144 | } | 2144 | } |
| 2145 | } | 2145 | } |