Cleaned up a couple compiler warnings.
							parent
							
								
									c78eebfdfc
								
							
						
					
					
						commit
						d2806090ae
					
				| 
						 | 
				
			
			@ -193,7 +193,6 @@ namespace OpenSim.Framework
 | 
			
		|||
                    packet.Header.Reliable = false;
 | 
			
		||||
                    LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task);
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -522,7 +522,7 @@ namespace OpenSim.Grid.GridServer
 | 
			
		|||
            //RegionProfileData TheSim = null;
 | 
			
		||||
            string uuid = String.Empty;;
 | 
			
		||||
            Hashtable requestData = (Hashtable) request.Params[0];
 | 
			
		||||
            string myword;
 | 
			
		||||
 | 
			
		||||
            if (requestData.ContainsKey("UUID")) {
 | 
			
		||||
                //TheSim = getRegion(new LLUUID((string) requestData["UUID"]));
 | 
			
		||||
                uuid = requestData["UUID"].ToString();
 | 
			
		||||
| 
						 | 
				
			
			@ -559,7 +559,8 @@ namespace OpenSim.Grid.GridServer
 | 
			
		|||
                            break;
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                catch (Exception e) {
 | 
			
		||||
                catch (Exception)
 | 
			
		||||
                {
 | 
			
		||||
                    m_log.Error("storage Unable to delete region " + uuid + " via MySQL");
 | 
			
		||||
                    //MainLog.Instance.Warn("storage", e.ToString());
 | 
			
		||||
                }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -738,11 +738,11 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
 | 
			
		|||
                    IClientAPI controller = null;
 | 
			
		||||
 | 
			
		||||
                    foreach (uint code in circuits)
 | 
			
		||||
                      {
 | 
			
		||||
                    {
 | 
			
		||||
                        m_log.InfoFormat("[BALANCER] "+"circuit code : {0}", code);
 | 
			
		||||
 | 
			
		||||
                        if (scene.ClientManager.TryGetClient(code, out controller))
 | 
			
		||||
                          {
 | 
			
		||||
                        {
 | 
			
		||||
                            // Divide the presences evenly over the set of subscenes
 | 
			
		||||
                            ClientView client = (ClientView) controller;
 | 
			
		||||
                            client.PacketProcessingEnabled = (( (i + myID) % sceneURL.Length) == 0);
 | 
			
		||||
| 
						 | 
				
			
			@ -750,15 +750,15 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
 | 
			
		|||
                            m_log.InfoFormat("[SPLITSCENE] === SplitRegion {0}: SP.PacketEnabled {1}", region.RegionID, client.PacketProcessingEnabled);
 | 
			
		||||
 | 
			
		||||
                            if (!client.PacketProcessingEnabled)
 | 
			
		||||
                               {
 | 
			
		||||
                            {
 | 
			
		||||
                                // stopping clientview thread
 | 
			
		||||
                                client.Stop();
 | 
			
		||||
                               }
 | 
			
		||||
                            }
 | 
			
		||||
 | 
			
		||||
                            ++i;
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                           ++i;
 | 
			
		||||
                          }
 | 
			
		||||
                      }
 | 
			
		||||
					
 | 
			
		||||
                    scene.splitID = myID;
 | 
			
		||||
                    scene.SynchronizeScene = new Scene.SynchronizeSceneHandler(SynchronizeScenes);
 | 
			
		||||
                    isSplit = true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -175,7 +175,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
 | 
			
		|||
                } // while (true)
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
            catch (Exception e)
 | 
			
		||||
            catch (Exception)
 | 
			
		||||
            {
 | 
			
		||||
                //MainLog.Instance.Verbose("TCPSERVER", e.ToString());
 | 
			
		||||
                //MainLog.Instance.Verbose("TCPSERVER", e.StackTrace);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue