parent
							
								
									04e3ae3733
								
							
						
					
					
						commit
						a3651eb5d0
					
				| 
						 | 
				
			
			@ -2129,17 +2129,17 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 | 
			
		|||
                }
 | 
			
		||||
                catch (DllNotFoundException)
 | 
			
		||||
                {
 | 
			
		||||
                    Rest.Log.ErrorFormat("OpenJpeg is not installed correctly on this system.   Asset Data is emtpy for {0}", ic.Item.Name);
 | 
			
		||||
                    Rest.Log.ErrorFormat("OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", ic.Item.Name);
 | 
			
		||||
                    ic.Asset.Data = new Byte[0];
 | 
			
		||||
                }
 | 
			
		||||
                catch (IndexOutOfRangeException)
 | 
			
		||||
                {
 | 
			
		||||
                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is emtpy for {0}", ic.Item.Name);
 | 
			
		||||
                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is empty for {0}", ic.Item.Name);
 | 
			
		||||
                    ic.Asset.Data = new Byte[0];
 | 
			
		||||
                }
 | 
			
		||||
                catch (Exception)
 | 
			
		||||
                {
 | 
			
		||||
                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is emtpy for {0}", ic.Item.Name);
 | 
			
		||||
                    Rest.Log.ErrorFormat("OpenJpeg was unable to encode this.   Asset Data is empty for {0}", ic.Item.Name);
 | 
			
		||||
                    ic.Asset.Data = new Byte[0];
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -83,7 +83,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 | 
			
		|||
        /// <summary>
 | 
			
		||||
        /// Regular expression used to match against path of the
 | 
			
		||||
        /// incoming HTTP request. If you want to match any string
 | 
			
		||||
        /// either use '.*' or null. To match on the emtpy string use
 | 
			
		||||
        /// either use '.*' or null. To match on the empty string use
 | 
			
		||||
        /// '^$'.
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        public virtual Regex Path
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -90,7 +90,7 @@ namespace OpenSim.Framework
 | 
			
		|||
                return deleted;
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
                throw new InvalidOperationException("Cannot pop from emtpy stack");
 | 
			
		||||
                throw new InvalidOperationException("Cannot pop from empty stack");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public T Peek()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 | 
			
		|||
            m_scene = scene;
 | 
			
		||||
            m_scene.RegisterModuleInterface<IRegionModule>(this);
 | 
			
		||||
            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            // ini file settings
 | 
			
		||||
            try
 | 
			
		||||
            {
 | 
			
		||||
| 
						 | 
				
			
			@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 | 
			
		|||
        {
 | 
			
		||||
            Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast");
 | 
			
		||||
            Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin");
 | 
			
		||||
            Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Enable the windlight plugin");
 | 
			
		||||
            Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Disable the windlight plugin");
 | 
			
		||||
 | 
			
		||||
            m_commander.RegisterCommand("load", wlload);
 | 
			
		||||
            m_commander.RegisterCommand("enable", wlenable);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -188,17 +188,17 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 | 
			
		|||
            }
 | 
			
		||||
            catch (DllNotFoundException)
 | 
			
		||||
            {
 | 
			
		||||
                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg is not installed correctly on this system.   Asset Data is emtpy for {0}", id);
 | 
			
		||||
                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg is not installed correctly on this system.   Asset Data is empty for {0}", id);
 | 
			
		||||
                
 | 
			
		||||
            }
 | 
			
		||||
            catch (IndexOutOfRangeException)
 | 
			
		||||
            {
 | 
			
		||||
                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this.   Asset Data is emtpy for {0}", id);
 | 
			
		||||
                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
 | 
			
		||||
                
 | 
			
		||||
            }
 | 
			
		||||
            catch (Exception)
 | 
			
		||||
            {
 | 
			
		||||
                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this.   Asset Data is emtpy for {0}", id);
 | 
			
		||||
                m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this.   Asset Data is empty for {0}", id);
 | 
			
		||||
                
 | 
			
		||||
            }
 | 
			
		||||
            return null;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue