OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties. Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-30 08:35:57 +00:00
parent 5b0d47dddb
commit 0462510956
21 changed files with 403 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTORS.txt
View File

@ -23,9 +23,10 @@ OpenSim Developers
* Danx0r * Danx0r
* Dalien * Dalien
* Darok * Darok
* chi11ken (3Di) * chi11ken (Genkii)
* adjohn (3Di) * adjohn (Genkii)
* Alondria * Alondria
* Dr Scofield (IBM)
Patches Patches
@ -38,7 +39,6 @@ Patches
* daTwitch * daTwitch
* mikkopa/_someone - RealXtend * mikkopa/_someone - RealXtend
* openlifegrid.com * openlifegrid.com
* Dr Scofield (IBM)
* Daedius * Daedius
* alex_carnell * alex_carnell
* webmage (IBM) * webmage (IBM)

12
OpenSim/Data/MySQL/MySQLGridData.cs
View File

@ -53,9 +53,12 @@ namespace OpenSim.Data.MySQL
/// </summary> /// </summary>
override public void Initialise(string connect) override public void Initialise(string connect)
{ {
if (connect != String.Empty) { if (connect != String.Empty)
{
database = new MySQLManager(connect); database = new MySQLManager(connect);
} else { }
else
{
m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead");
IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
@ -65,9 +68,8 @@ namespace OpenSim.Data.MySQL
string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
database = database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword,
new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPooling, settingPort);
settingPort);
} }
TestTables(); TestTables();

12
OpenSim/Data/MySQL/MySQLLogData.cs
View File

@ -46,9 +46,12 @@ namespace OpenSim.Data.MySQL
/// </summary> /// </summary>
public void Initialise(string connect) public void Initialise(string connect)
{ {
if (connect != String.Empty) { if (connect != String.Empty)
{
database = new MySQLManager(connect); database = new MySQLManager(connect);
} else { }
else
{
m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead");
IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
@ -59,9 +62,8 @@ namespace OpenSim.Data.MySQL
string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
database = database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword,
new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPooling, settingPort);
settingPort);
} }
} }

15
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -84,7 +84,8 @@ namespace OpenSim.Framework.Servers
string handlerKey = GetHandlerKey(httpMethod, path); string handlerKey = GetHandlerKey(httpMethod, path);
lock(m_streamHandlers) { lock (m_streamHandlers)
{
if (!m_streamHandlers.ContainsKey(handlerKey)) if (!m_streamHandlers.ContainsKey(handlerKey))
{ {
//m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); //m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
@ -100,7 +101,8 @@ namespace OpenSim.Framework.Servers
public bool AddXmlRPCHandler(string method, XmlRpcMethod handler) public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
{ {
lock(m_rpcHandlers) { lock (m_rpcHandlers)
{
if (!m_rpcHandlers.ContainsKey(method)) if (!m_rpcHandlers.ContainsKey(method))
{ {
m_rpcHandlers.Add(method, handler); m_rpcHandlers.Add(method, handler);
@ -114,7 +116,8 @@ namespace OpenSim.Framework.Servers
public bool AddHTTPHandler(string method, GenericHTTPMethod handler) public bool AddHTTPHandler(string method, GenericHTTPMethod handler)
{ {
lock(m_HTTPHandlers) { lock (m_HTTPHandlers)
{
if (!m_HTTPHandlers.ContainsKey(method)) if (!m_HTTPHandlers.ContainsKey(method))
{ {
m_HTTPHandlers.Add(method, handler); m_HTTPHandlers.Add(method, handler);
@ -132,7 +135,8 @@ namespace OpenSim.Framework.Servers
public bool AddAgentHandler(string agent, IHttpAgentHandler handler) public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
{ {
lock(m_agentHandlers) { lock (m_agentHandlers)
{
if (!m_agentHandlers.ContainsKey(agent)) if (!m_agentHandlers.ContainsKey(agent))
{ {
m_agentHandlers.Add(agent, handler); m_agentHandlers.Add(agent, handler);
@ -171,7 +175,8 @@ namespace OpenSim.Framework.Servers
if (TryGetAgentHandler(request, response, out agentHandler)) if (TryGetAgentHandler(request, response, out agentHandler))
{ {
if (HandleAgentRequest(agentHandler, request, response)) { if (HandleAgentRequest(agentHandler, request, response))
{
m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent); m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent);
return; return;
} }

64
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -658,7 +658,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// this will normally trigger at least one packet (ping response) // this will normally trigger at least one packet (ping response)
SendStartPingCheck(0); SendStartPingCheck(0);
} }
} }
else else
@ -666,7 +665,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Something received in the meantime - we can reset the counters // Something received in the meantime - we can reset the counters
m_probesWithNoIngressPackets = 0; m_probesWithNoIngressPackets = 0;
m_lastPacketsReceived = m_packetsReceived; m_lastPacketsReceived = m_packetsReceived;
} }
//SendPacketStats(); //SendPacketStats();
} }
@ -726,7 +724,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Previously ClientView.API partial class // Previously ClientView.API partial class
public event Action<IClientAPI> OnLogout; public event Action<IClientAPI> OnLogout;
public event ObjectPermissions OnObjectPermissions; public event ObjectPermissions OnObjectPermissions;
public event Action<IClientAPI> OnConnectionClosed; public event Action<IClientAPI> OnConnectionClosed;
public event ViewerEffectEventHandler OnViewerEffect; public event ViewerEffectEventHandler OnViewerEffect;
public event ImprovedInstantMessage OnInstantMessage; public event ImprovedInstantMessage OnInstantMessage;
@ -788,12 +785,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event DisconnectUser OnDisconnectUser; public event DisconnectUser OnDisconnectUser;
public event RequestAvatarProperties OnRequestAvatarProperties; public event RequestAvatarProperties OnRequestAvatarProperties;
public event SetAlwaysRun OnSetAlwaysRun; public event SetAlwaysRun OnSetAlwaysRun;
public event FetchInventory OnAgentDataUpdateRequest; public event FetchInventory OnAgentDataUpdateRequest;
public event FetchInventory OnUserInfoRequest; public event FetchInventory OnUserInfoRequest;
public event TeleportLocationRequest OnSetStartLocationRequest; public event TeleportLocationRequest OnSetStartLocationRequest;
public event UpdateAvatarProperties OnUpdateAvatarProperties; public event UpdateAvatarProperties OnUpdateAvatarProperties;
public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateNewInventoryItem OnCreateNewInventoryItem;
public event CreateInventoryFolder OnCreateNewInventoryFolder; public event CreateInventoryFolder OnCreateNewInventoryFolder;
public event UpdateInventoryFolder OnUpdateInventoryFolder; public event UpdateInventoryFolder OnUpdateInventoryFolder;
@ -816,9 +811,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event MoveTaskInventory OnMoveTaskItem; public event MoveTaskInventory OnMoveTaskItem;
public event RemoveTaskInventory OnRemoveTaskItem; public event RemoveTaskInventory OnRemoveTaskItem;
public event RequestAsset OnRequestAsset; public event RequestAsset OnRequestAsset;
public event UUIDNameRequest OnNameFromUUIDRequest; public event UUIDNameRequest OnNameFromUUIDRequest;
public event ParcelAccessListRequest OnParcelAccessListRequest; public event ParcelAccessListRequest OnParcelAccessListRequest;
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest; public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
public event ParcelPropertiesRequest OnParcelPropertiesRequest; public event ParcelPropertiesRequest OnParcelPropertiesRequest;
@ -829,36 +822,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
public event ParcelAbandonRequest OnParcelAbandonRequest; public event ParcelAbandonRequest OnParcelAbandonRequest;
public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest; public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
public event RegionInfoRequest OnRegionInfoRequest; public event RegionInfoRequest OnRegionInfoRequest;
public event EstateCovenantRequest OnEstateCovenantRequest; public event EstateCovenantRequest OnEstateCovenantRequest;
public event FriendActionDelegate OnApproveFriendRequest; public event FriendActionDelegate OnApproveFriendRequest;
public event FriendActionDelegate OnDenyFriendRequest; public event FriendActionDelegate OnDenyFriendRequest;
public event FriendshipTermination OnTerminateFriendship; public event FriendshipTermination OnTerminateFriendship;
public event PacketStats OnPacketStats; public event PacketStats OnPacketStats;
public event MoneyTransferRequest OnMoneyTransferRequest; public event MoneyTransferRequest OnMoneyTransferRequest;
public event EconomyDataRequest OnEconomyDataRequest; public event EconomyDataRequest OnEconomyDataRequest;
public event MoneyBalanceRequest OnMoneyBalanceRequest; public event MoneyBalanceRequest OnMoneyBalanceRequest;
public event ParcelBuy OnParcelBuy; public event ParcelBuy OnParcelBuy;
public event UUIDNameRequest OnTeleportHomeRequest; public event UUIDNameRequest OnTeleportHomeRequest;
public event UUIDNameRequest OnUUIDGroupNameRequest; public event UUIDNameRequest OnUUIDGroupNameRequest;
public event ScriptAnswer OnScriptAnswer; public event ScriptAnswer OnScriptAnswer;
public event RequestPayPrice OnRequestPayPrice; public event RequestPayPrice OnRequestPayPrice;
public event AgentSit OnUndo; public event AgentSit OnUndo;
public event ForceReleaseControls OnForceReleaseControls; public event ForceReleaseControls OnForceReleaseControls;
public event GodLandStatRequest OnLandStatRequest; public event GodLandStatRequest OnLandStatRequest;
public event RequestObjectPropertiesFamily OnObjectGroupRequest; public event RequestObjectPropertiesFamily OnObjectGroupRequest;
public event DetailedEstateDataRequest OnDetailedEstateDataRequest; public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
public event SetEstateFlagsRequest OnSetEstateFlagsRequest; public event SetEstateFlagsRequest OnSetEstateFlagsRequest;
public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture; public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
@ -1049,7 +1030,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//} //}
} }
private void DoSendLayerData(object o) private void DoSendLayerData(object o)
{ {
float[] map = (float[])o; float[] map = (float[])o;
@ -1083,7 +1063,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(layerpack, ThrottleOutPacketType.Land); OutPacket(layerpack, ThrottleOutPacketType.Land);
} }
/// <summary> /// <summary>
/// Sends a specified patch to a client /// Sends a specified patch to a client
/// </summary> /// </summary>
@ -1449,7 +1428,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (i < MAX_ITEMS_PER_PACKET) if (i < MAX_ITEMS_PER_PACKET)
{ {
OutPacket(descend, ThrottleOutPacketType.Asset); OutPacket(descend, ThrottleOutPacketType.Asset);
} }
} }
@ -1748,7 +1726,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
economyData.Info.TeleportPriceExponent = TeleportPriceExponent; economyData.Info.TeleportPriceExponent = TeleportPriceExponent;
economyData.Header.Reliable = true; economyData.Header.Reliable = true;
OutPacket(economyData, ThrottleOutPacketType.Unknown); OutPacket(economyData, ThrottleOutPacketType.Unknown);
} }
public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data) public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
@ -2258,7 +2235,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
outPacket.ObjectData[0].Radius = (float) SoundRadius; outPacket.ObjectData[0].Radius = (float) SoundRadius;
outPacket.ObjectData[0].Flags = SoundFlags; outPacket.ObjectData[0].Flags = SoundFlags;
byte[] pb = pos.GetBytes(); byte[] pb = pos.GetBytes();
Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
@ -2318,6 +2294,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
terse.Header.Zerocoded = true; terse.Header.Zerocoded = true;
OutPacket(terse, ThrottleOutPacketType.Task); OutPacket(terse, ThrottleOutPacketType.Task);
} }
public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID) public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID)
{ {
AssetUploadCompletePacket newPack = new AssetUploadCompletePacket(); AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
@ -2327,6 +2304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newPack.Header.Zerocoded = true; newPack.Header.Zerocoded = true;
OutPacket(newPack, ThrottleOutPacketType.Asset); OutPacket(newPack, ThrottleOutPacketType.Asset);
} }
public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName) public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName)
{ {
RequestXferPacket newPack = new RequestXferPacket(); RequestXferPacket newPack = new RequestXferPacket();
@ -2337,8 +2315,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newPack.XferID.Filename = FileName; newPack.XferID.Filename = FileName;
newPack.Header.Zerocoded = true; newPack.Header.Zerocoded = true;
OutPacket(newPack, ThrottleOutPacketType.Asset); OutPacket(newPack, ThrottleOutPacketType.Asset);
} }
public void SendConfirmXfer(ulong xferID, uint PacketID) public void SendConfirmXfer(ulong xferID, uint PacketID)
{ {
ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket(); ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket();
@ -2347,6 +2325,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newPack.Header.Zerocoded = true; newPack.Header.Zerocoded = true;
OutPacket(newPack, ThrottleOutPacketType.Asset); OutPacket(newPack, ThrottleOutPacketType.Asset);
} }
public void SendImagePart(ushort numParts, LLUUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) public void SendImagePart(ushort numParts, LLUUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
{ {
ImageDataPacket im = new ImageDataPacket(); ImageDataPacket im = new ImageDataPacket();
@ -2362,6 +2341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
im.Header.Zerocoded = true; im.Header.Zerocoded = true;
OutPacket(im, ThrottleOutPacketType.Texture); OutPacket(im, ThrottleOutPacketType.Texture);
} }
public void SendShutdownConnectionNotice() public void SendShutdownConnectionNotice()
{ {
OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator), ThrottleOutPacketType.Unknown); OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator), ThrottleOutPacketType.Unknown);
@ -2449,6 +2429,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion #endregion
#region Estate Data Sending Methods #region Estate Data Sending Methods
private bool convertParamStringToBool(byte[] field) private bool convertParamStringToBool(byte[] field)
{ {
string s = Helpers.FieldToUTF8String(field); string s = Helpers.FieldToUTF8String(field);
@ -2514,7 +2495,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
rinfoblk.WaterHeight = args.waterHeight; rinfoblk.WaterHeight = args.waterHeight;
rinfoblk.SimName = Helpers.StringToField(args.simName); rinfoblk.SimName = Helpers.StringToField(args.simName);
rinfopack.RegionInfo = rinfoblk; rinfopack.RegionInfo = rinfoblk;
this.OutPacket(rinfopack, ThrottleOutPacketType.Task); this.OutPacket(rinfopack, ThrottleOutPacketType.Task);
@ -2568,6 +2548,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion #endregion
#region Land Data Sending Methods #region Land Data Sending Methods
public void sendLandParcelOverlay(byte[] data, int sequence_id) public void sendLandParcelOverlay(byte[] data, int sequence_id)
{ {
@ -2578,6 +2559,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
packet.Header.Zerocoded = true; packet.Header.Zerocoded = true;
this.OutPacket(packet, ThrottleOutPacketType.Task); this.OutPacket(packet, ThrottleOutPacketType.Task);
} }
public void sendLandProperties(IClientAPI remote_client,int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int simObjectCapacity, uint regionFlags) public void sendLandProperties(IClientAPI remote_client,int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int simObjectCapacity, uint regionFlags)
{ {
ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties); ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
@ -2743,8 +2725,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
notifyCount = 32; notifyCount = 32;
} }
ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
= new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount]; = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@ -2958,7 +2938,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bytes[i++] = (byte)((rvelz >> 8) % 256); bytes[i++] = (byte)((rvelz >> 8) % 256);
dat.Data = bytes; dat.Data = bytes;
return dat; return dat;
} }
@ -3034,7 +3013,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
objdata.ObjectData[47] = 63; objdata.ObjectData[47] = 63;
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -3165,13 +3143,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
false); false);
} }
return true; return true;
} }
else else
{ {
return false; return false;
} }
} }
private bool HandleUUIDGroupNameRequest(IClientAPI sender, Packet Pack) private bool HandleUUIDGroupNameRequest(IClientAPI sender, Packet Pack)
@ -3205,8 +3181,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return true; return true;
} }
private bool HandleViewerEffect(IClientAPI sender, Packet Pack) private bool HandleViewerEffect(IClientAPI sender, Packet Pack)
{ {
ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
@ -3346,7 +3320,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
if (handlerUpdatePrimSinglePosition != null) if (handlerUpdatePrimSinglePosition != null)
{ {
// Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
handlerUpdatePrimSinglePosition(localId, pos1, this); handlerUpdatePrimSinglePosition(localId, pos1, this);
} }
@ -3357,7 +3330,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
if (handlerUpdatePrimSingleRotation != null) if (handlerUpdatePrimSingleRotation != null)
{ {
//Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); //Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
handlerUpdatePrimSingleRotation(localId, rot1, this); handlerUpdatePrimSingleRotation(localId, rot1, this);
} }
@ -3368,7 +3340,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
if (handlerUpdatePrimSingleRotation != null) if (handlerUpdatePrimSingleRotation != null)
{ {
//Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); //Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
handlerUpdatePrimSingleRotation(localId, rot2, this); handlerUpdatePrimSingleRotation(localId, rot2, this);
} }
@ -3381,11 +3352,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerUpdatePrimScale = OnUpdatePrimScale; handlerUpdatePrimScale = OnUpdatePrimScale;
if (handlerUpdatePrimScale != null) if (handlerUpdatePrimScale != null)
{ {
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
handlerUpdatePrimScale(localId, scale1, this); handlerUpdatePrimScale(localId, scale1, this);
handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
if (handlerUpdatePrimSinglePosition != null) if (handlerUpdatePrimSinglePosition != null)
{ {
@ -3405,40 +3374,34 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
break; break;
case 10: case 10:
LLQuaternion rot3 = new LLQuaternion(block.Data, 0, true); LLQuaternion rot3 = new LLQuaternion(block.Data, 0, true);
handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
if (handlerUpdatePrimRotation != null) if (handlerUpdatePrimRotation != null)
{ {
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
handlerUpdatePrimRotation(localId, rot3, this); handlerUpdatePrimRotation(localId, rot3, this);
} }
break; break;
case 11: case 11:
LLVector3 pos3 = new LLVector3(block.Data, 0); LLVector3 pos3 = new LLVector3(block.Data, 0);
LLQuaternion rot4 = new LLQuaternion(block.Data, 12, true); LLQuaternion rot4 = new LLQuaternion(block.Data, 12, true);
handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
if (handlerUpdatePrimGroupRotation != null) if (handlerUpdatePrimGroupRotation != null)
{ {
//Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
handlerUpdatePrimGroupRotation(localId, pos3, rot4, this); handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
} }
break; break;
case 13: case 13:
LLVector3 scale2 = new LLVector3(block.Data, 12); LLVector3 scale2 = new LLVector3(block.Data, 12);
LLVector3 pos4 = new LLVector3(block.Data, 0); LLVector3 pos4 = new LLVector3(block.Data, 0);
handlerUpdatePrimScale = OnUpdatePrimScale; handlerUpdatePrimScale = OnUpdatePrimScale;
if (handlerUpdatePrimScale != null) if (handlerUpdatePrimScale != null)
{ {
//Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
handlerUpdatePrimScale(localId, scale2, this); handlerUpdatePrimScale(localId, scale2, this);
@ -3464,7 +3427,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (handlerUpdateVector != null) if (handlerUpdateVector != null)
{ {
handlerUpdateVector(localId, pos5, this); handlerUpdateVector(localId, pos5, this);
} }
} }
@ -3841,11 +3803,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea) protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
{ {
SendAcks(); SendAcks();
ResendUnacked(); ResendUnacked();
SendPacketStats(); SendPacketStats();
} }
protected void SendPacketStats() protected void SendPacketStats()
@ -3858,6 +3818,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_lastPacketsSentSentToScene = m_packetsSent; m_lastPacketsSentSentToScene = m_packetsSent;
} }
} }
protected void ClearOldPacketDupeTracking() protected void ClearOldPacketDupeTracking()
{ {
lock (m_dupeLimiter) lock (m_dupeLimiter)
@ -3865,7 +3826,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
List<uint> toEliminate = new List<uint>(); List<uint> toEliminate = new List<uint>();
try try
{ {
foreach (uint seq in m_dupeLimiter.Keys) foreach (uint seq in m_dupeLimiter.Keys)
{ {
PacketDupeLimiter pkdata = null; PacketDupeLimiter pkdata = null;
@ -3913,7 +3873,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private bool m_packetProcessingEnabled = true; private bool m_packetProcessingEnabled = true;
public bool IsActive { public bool IsActive
{
get { return m_packetProcessingEnabled; } get { return m_packetProcessingEnabled; }
set { m_packetProcessingEnabled = value; } set { m_packetProcessingEnabled = value; }
} }
@ -3945,7 +3906,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
else else
{ {
switch (Pack.Type) switch (Pack.Type)
{ {
#region Scene/Avatar #region Scene/Avatar
@ -5348,7 +5308,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#endregion #endregion
case PacketType.UUIDNameRequest: case PacketType.UUIDNameRequest:
UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack; UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock) foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
@ -5525,7 +5484,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
case PacketType.EstateOwnerMessage: case PacketType.EstateOwnerMessage:
EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
switch (Helpers.FieldToUTF8String(messagePacket.MethodData.Method)) switch (Helpers.FieldToUTF8String(messagePacket.MethodData.Method))
{ {
case "getinfo": case "getinfo":

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -398,8 +398,10 @@ namespace OpenSim.Region.Communications.OGS1
public RegionInfo RequestClosestRegion(string regionName) public RegionInfo RequestClosestRegion(string regionName)
{ {
foreach (RegionInfo ri in m_remoteRegionInfoCache.Values) foreach (RegionInfo ri in m_remoteRegionInfoCache.Values)
{
if (ri.RegionName == regionName) if (ri.RegionName == regionName)
return ri; return ri;
}
RegionInfo regionInfo = null; RegionInfo regionInfo = null;
try try

27
OpenSim/Region/Physics/Meshing/Extruder.cs
View File

@ -62,7 +62,6 @@ namespace OpenSim.Region.Physics.Meshing
public float pathTaperX = 0.0f; public float pathTaperX = 0.0f;
public float pathTaperY = 0.0f; public float pathTaperY = 0.0f;
public Mesh Extrude(Mesh m) public Mesh Extrude(Mesh m)
{ {
startParameter = float.MinValue; startParameter = float.MinValue;
@ -129,8 +128,8 @@ namespace OpenSim.Region.Physics.Meshing
v.Y = v2.Y; v.Y = v2.Y;
v.Z = v2.Z; v.Z = v2.Z;
} }
} }
foreach (Vertex v in workingMinus.vertices) foreach (Vertex v in workingMinus.vertices)
{ {
if (v == null) if (v == null)
@ -159,10 +158,8 @@ namespace OpenSim.Region.Physics.Meshing
} }
result.Append(workingMinus); result.Append(workingMinus);
result.Append(workingMiddle); result.Append(workingMiddle);
int iLastNull = 0; int iLastNull = 0;
for (int i = 0; i < workingMiddle.vertices.Count; i++) for (int i = 0; i < workingMiddle.vertices.Count; i++)
@ -228,6 +225,7 @@ namespace OpenSim.Region.Physics.Meshing
new Triangle(workingPlus.vertices[iNext], workingMiddle.vertices[i], workingMiddle.vertices[iNext]); new Triangle(workingPlus.vertices[iNext], workingMiddle.vertices[i], workingMiddle.vertices[iNext]);
result.Add(tSide); result.Add(tSide);
} }
if (twistMid != 0) if (twistMid != 0)
{ {
foreach (Vertex v in result.vertices) foreach (Vertex v in result.vertices)
@ -245,6 +243,7 @@ namespace OpenSim.Region.Physics.Meshing
} }
return result; return result;
} }
public Mesh ExtrudeCircularPath(Mesh m) public Mesh ExtrudeCircularPath(Mesh m)
{ {
//startParameter = float.MinValue; //startParameter = float.MinValue;
@ -294,8 +293,6 @@ namespace OpenSim.Region.Physics.Meshing
//System.Console.WriteLine("taperBotFactorX: " + taperBotFactorX.ToString() + " taperBotFactorY: " + taperBotFactorY.ToString() //System.Console.WriteLine("taperBotFactorX: " + taperBotFactorX.ToString() + " taperBotFactorY: " + taperBotFactorY.ToString()
// + " taperTopFactorX: " + taperTopFactorX.ToString() + " taperTopFactorY: " + taperTopFactorY.ToString()); // + " taperTopFactorX: " + taperTopFactorX.ToString() + " taperTopFactorY: " + taperTopFactorY.ToString());
do do
{ {
float percentOfPath = 1.0f; float percentOfPath = 1.0f;
@ -328,10 +325,6 @@ namespace OpenSim.Region.Physics.Meshing
//System.Console.WriteLine("Extruder: radius: " + radius.ToString() + " radiusScale: " + radiusScale.ToString()); //System.Console.WriteLine("Extruder: radius: " + radius.ToString() + " radiusScale: " + radiusScale.ToString());
float twist = twistBot + (twistTotal * (float)percentOfPath); float twist = twistBot + (twistTotal * (float)percentOfPath);
float zOffset = (float)(System.Math.Sin(angle) * (0.5f - yPathScale)) * radiusScale; float zOffset = (float)(System.Math.Sin(angle) * (0.5f - yPathScale)) * radiusScale;
@ -404,13 +397,6 @@ namespace OpenSim.Region.Physics.Meshing
} }
lastLayer = newLayer; lastLayer = newLayer;
// calc next angle // calc next angle
if (angle >= endAngle) if (angle >= endAngle)
@ -421,10 +407,7 @@ namespace OpenSim.Region.Physics.Meshing
if (angle > endAngle) if (angle > endAngle)
angle = endAngle; angle = endAngle;
} }
} } while (!done);
while (!done);
// scale the mesh to the desired size // scale the mesh to the desired size
float xScale = size.X; float xScale = size.X;
@ -432,12 +415,14 @@ namespace OpenSim.Region.Physics.Meshing
float zScale = size.Z; float zScale = size.Z;
foreach (Vertex v in result.vertices) foreach (Vertex v in result.vertices)
{
if (v != null) if (v != null)
{ {
v.X *= xScale; v.X *= xScale;
v.Y *= yScale; v.Y *= yScale;
v.Z *= zScale; v.Z *= zScale;
} }
}
return result; return result;
} }