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

Formatting cleanup.

0.6.6-post-fixes
Jeff Ames 2009-06-10 04:28:56 +00:00
parent ca52c3ef26
commit a23d64dec1
61 changed files with 120 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
View File

@ -181,7 +181,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
if (m_openSim.userStatsURI != String.Empty ) if (m_openSim.userStatsURI != String.Empty)
m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
} }
@ -213,7 +213,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
if (m_openSim.userStatsURI != String.Empty ) if (m_openSim.userStatsURI != String.Empty)
m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
} }

14
OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
View File

@ -392,9 +392,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// on anything other than a URI token boundary. Otherwise we // on anything other than a URI token boundary. Otherwise we
// may match on URL's that were not intended for this handler. // may match on URL's that were not intended for this handler.
return ( path.Length == key.Length || return (path.Length == key.Length ||
path.Substring(key.Length,1) == Rest.UrlPathSeparator); path.Substring(key.Length, 1) == Rest.UrlPathSeparator);
} }
} }
@ -416,9 +415,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// on anything other than a URI token boundary. Otherwise we // on anything other than a URI token boundary. Otherwise we
// may match on URL's that were not intended for this handler. // may match on URL's that were not intended for this handler.
return ( path.Length == key.Length || return (path.Length == key.Length ||
path.Substring(key.Length,1) == Rest.UrlPathSeparator); path.Substring(key.Length, 1) == Rest.UrlPathSeparator);
} }
} }
} }
@ -465,8 +463,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
try try
{ {
handled = ( FindPathHandler(request, response) || handled = (FindPathHandler(request, response) ||
FindStreamHandler(request, response) ); FindStreamHandler(request, response));
} }
catch (Exception e) catch (Exception e)
{ {

6
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

@ -740,7 +740,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// Scan the set of folders in the entity collection for an // Scan the set of folders in the entity collection for an
// entry that matches the context folder. It is assumed that // entry that matches the context folder. It is assumed that
// the only reliable indicator of this is a zero UUID ( using // the only reliable indicator of this is a zero UUID (using
// implicit context), or the parent's UUID matches that of the // implicit context), or the parent's UUID matches that of the
// URI designated node (explicit context). We don't allow // URI designated node (explicit context). We don't allow
// ambiguity in this case because this is POST and we are // ambiguity in this case because this is POST and we are
@ -1621,7 +1621,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
foreach (InventoryFolderBase parent in ic.rdata.folders) foreach (InventoryFolderBase parent in ic.rdata.folders)
{ {
if ( parent.ID == result.ParentID ) if (parent.ID == result.ParentID)
{ {
found = true; found = true;
break; break;
@ -2002,7 +2002,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
foreach (InventoryFolderBase parent in ic.rdata.folders) foreach (InventoryFolderBase parent in ic.rdata.folders)
{ {
if ( parent.ID == ic.Item.Folder ) if (parent.ID == ic.Item.Folder)
{ {
found = true; found = true;
break; break;

2
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

@ -183,7 +183,7 @@ namespace OpenSim.Data.NHibernate
ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart)); ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart));
criteria.Add(Expression.Eq("RegionID", region)); criteria.Add(Expression.Eq("RegionID", region));
criteria.Add(Expression.Eq("ParentUUID", uuid)); criteria.Add(Expression.Eq("ParentUUID", uuid));
criteria.AddOrder( Order.Asc("ParentID") ); criteria.AddOrder(Order.Asc("ParentID"));
foreach (SceneObjectPart p in criteria.List()) foreach (SceneObjectPart p in criteria.List())
{ {

2
OpenSim/Data/RegionProfileServiceProxy.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Data
public RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl, public RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl,
string gridserverSendkey, string gridserverRecvkey) string gridserverSendkey, string gridserverRecvkey)
{ {
return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName ); return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName);
} }
} }
} }

8
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -1195,14 +1195,14 @@ namespace OpenSim.Data.SQLite
private void setupAgentCommands(SqliteDataAdapter da, SqliteConnection conn) private void setupAgentCommands(SqliteDataAdapter da, SqliteConnection conn)
{ {
da.InsertCommand = SQLiteUtil.createInsertCommand( "useragents", ds.Tables["useragents"]); da.InsertCommand = SQLiteUtil.createInsertCommand("useragents", ds.Tables["useragents"]);
da.InsertCommand.Connection = conn; da.InsertCommand.Connection = conn;
da.UpdateCommand = SQLiteUtil.createUpdateCommand( "useragents", "UUID=:UUID", ds.Tables["useragents"]); da.UpdateCommand = SQLiteUtil.createUpdateCommand("useragents", "UUID=:UUID", ds.Tables["useragents"]);
da.UpdateCommand.Connection = conn; da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand( "delete from useragents where UUID = :ProfileID"); SqliteCommand delete = new SqliteCommand("delete from useragents where UUID = :ProfileID");
delete.Parameters.Add( SQLiteUtil.createSqliteParameter( "ProfileID", typeof(String))); delete.Parameters.Add(SQLiteUtil.createSqliteParameter("ProfileID", typeof(String)));
delete.Connection = conn; delete.Connection = conn;
da.DeleteCommand = delete; da.DeleteCommand = delete;
} }

2
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -286,7 +286,7 @@ namespace OpenSim.Framework.Communications.Cache
// Take all ther received items and put them into the folder tree heirarchy // Take all ther received items and put them into the folder tree heirarchy
foreach (InventoryItemBase item in items) { foreach (InventoryItemBase item in items) {
InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null; InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null;
ItemReceive(item, folder ); ItemReceive(item, folder);
} }
} }
catch (Exception e) catch (Exception e)

2
OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Tests
{ {
UserProfileData userProfile = new UserProfileData(); UserProfileData userProfile = new UserProfileData();
// userProfile.ID = new UUID( Util.GetHashGuid( uri.ToString(), AssetCache.AssetInfo.Secret )); // userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret));
return userProfile; return userProfile;
} }

2
OpenSim/Framework/IClientAPI.cs
View File

@ -192,7 +192,7 @@ namespace OpenSim.Framework
public delegate void ParcelReturnObjectsRequest( public delegate void ParcelReturnObjectsRequest(
int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client); int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
public delegate void ParcelDeedToGroup( int local_id, UUID group_id, IClientAPI remote_client); public delegate void ParcelDeedToGroup(int local_id, UUID group_id, IClientAPI remote_client);
public delegate void EstateOwnerMessageRequest( public delegate void EstateOwnerMessageRequest(
UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters, UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters,

8
OpenSim/Framework/ICnmCache.cs
View File

@ -348,7 +348,7 @@ namespace OpenSim.Framework
/// <seealso cref="TryGetValue"/> /// <seealso cref="TryGetValue"/>
/// <seealso cref="Clear"/> /// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/> /// <seealso cref="PurgeExpired"/>
void Remove( TKey key ); void Remove(TKey key);
/// <summary> /// <summary>
/// Removes elements that are associated with one of <paramref name="keys"/> from the <see cref="ICnmCache{TKey,TValue}"/>. /// Removes elements that are associated with one of <paramref name="keys"/> from the <see cref="ICnmCache{TKey,TValue}"/>.
@ -364,7 +364,7 @@ namespace OpenSim.Framework
/// <seealso cref="TryGetValue"/> /// <seealso cref="TryGetValue"/>
/// <seealso cref="Clear"/> /// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/> /// <seealso cref="PurgeExpired"/>
void RemoveRange( IEnumerable<TKey> keys ); void RemoveRange(IEnumerable<TKey> keys);
/// <summary> /// <summary>
/// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
@ -411,7 +411,7 @@ namespace OpenSim.Framework
/// <seealso cref="TryGetValue"/> /// <seealso cref="TryGetValue"/>
/// <seealso cref="Clear"/> /// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/> /// <seealso cref="PurgeExpired"/>
bool Set( TKey key, TValue value, long size ); bool Set(TKey key, TValue value, long size);
/// <summary> /// <summary>
/// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>. /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
@ -436,6 +436,6 @@ namespace OpenSim.Framework
/// <seealso cref="RemoveRange"/> /// <seealso cref="RemoveRange"/>
/// <seealso cref="Clear"/> /// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/> /// <seealso cref="PurgeExpired"/>
bool TryGetValue( TKey key, out TValue value ); bool TryGetValue(TKey key, out TValue value);
} }
} }

6
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -490,13 +490,13 @@ namespace OpenSim.Framework.Servers
public string StatReport(OSHttpRequest httpRequest) public string StatReport(OSHttpRequest httpRequest)
{ {
// If we catch a request for "callback", wrap the response in the value for jsonp // If we catch a request for "callback", wrap the response in the value for jsonp
if ( httpRequest.Query.ContainsKey("callback")) if (httpRequest.Query.ContainsKey("callback"))
{ {
return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ) + ");"; return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
} }
else else
{ {
return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
} }
} }

2
OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs
View File

@ -30,6 +30,6 @@ using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Servers.HttpServer namespace OpenSim.Framework.Servers.HttpServer
{ {
public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); public delegate OSD LLSDMethod(string path, OSD request, string endpoint);
public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client); public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client);
} }

2
OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests
[Test] [Test]
public void TestConstructor() public void TestConstructor()
{ {
new BaseRequestHandlerImpl( null, null ); new BaseRequestHandlerImpl(null, null);
} }
[Test] [Test]

2
OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.Tests
TestHelper.InMethod(); TestHelper.InMethod();
// GetAssetStreamHandler handler = // GetAssetStreamHandler handler =
new GetAssetStreamHandler( null ); new GetAssetStreamHandler(null);
} }
[Test] [Test]

2
OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
View File

@ -38,7 +38,7 @@ namespace OpenSim.Framework.Servers.Tests
[Test] [Test]
public void TestVersionLength() public void TestVersionLength()
{ {
Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." ); Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars.");
} }
[Test] [Test]

2
OpenSim/Framework/UserConfig.cs
View File

@ -165,7 +165,7 @@ namespace OpenSim.Framework
DefaultStartupMsg = (string) configuration_result; DefaultStartupMsg = (string) configuration_result;
break; break;
case "default_grid_server": case "default_grid_server":
GridServerURL = new Uri( (string) configuration_result ); GridServerURL = new Uri((string) configuration_result);
break; break;
case "grid_send_key": case "grid_send_key":
GridSendKey = (string) configuration_result; GridSendKey = (string) configuration_result;

4
OpenSim/Framework/Util.cs
View File

@ -1060,11 +1060,11 @@ namespace OpenSim.Framework
public static Guid GetHashGuid(string data, string salt) public static Guid GetHashGuid(string data, string salt)
{ {
byte[] hash = ComputeMD5Hash( data + salt ); byte[] hash = ComputeMD5Hash(data + salt);
//string s = BitConverter.ToString(hash); //string s = BitConverter.ToString(hash);
Guid guid = new Guid( hash ); Guid guid = new Guid(hash);
return guid; return guid;
} }

2
OpenSim/Framework/WearableItem.cs
View File

@ -131,7 +131,7 @@ namespace OpenSim.Framework
{ {
//int randNum = Util.RandomClass.Next(0, 1000); //int randNum = Util.RandomClass.Next(0, 1000);
float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue; float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue;
// float val =((float) randNum )/ ((float)(1000.0f / range)); // float val = ((float) randNum) / ((float)(1000.0f / range));
float val = (float)Util.RandomClass.NextDouble() * range * 0.2f; float val = (float)Util.RandomClass.NextDouble() * range * 0.2f;
setting.Value = setting.VisualParam.MinValue + (range / 2) + val; setting.Value = setting.VisualParam.MinValue + (range / 2) + val;
} }

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -391,7 +391,7 @@ namespace OpenSim
scene.LoadPrimsFromStorage(regionInfo.originRegionID); scene.LoadPrimsFromStorage(regionInfo.originRegionID);
// TODO : Try setting resource for region xstats here on scene // TODO : Try setting resource for region xstats here on scene
scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); scene.CommsManager.HttpServer.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
try try
{ {

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

@ -9453,7 +9453,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
// in the end, we dereference this, so we have to check if it's null // in the end, we dereference this, so we have to check if it's null
if (m_imageManager != null ) if (m_imageManager != null)
m_imageManager.ProcessImageQueue(10); m_imageManager.ProcessImageQueue(10);
PacketPool.Instance.ReturnPacket(Pack); PacketPool.Instance.ReturnPacket(Pack);
} }
@ -10164,7 +10164,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
mirplk.AgentData.AgentID = AgentId; mirplk.AgentData.AgentID = AgentId;
mirplk.RequestData.ItemType = mapitemtype; mirplk.RequestData.ItemType = mapitemtype;
mirplk.Data = new MapItemReplyPacket.DataBlock[replies.Length]; mirplk.Data = new MapItemReplyPacket.DataBlock[replies.Length];
for (int i = 0; i < replies.Length; i++ ) for (int i = 0; i < replies.Length; i++)
{ {
MapItemReplyPacket.DataBlock mrdata = new MapItemReplyPacket.DataBlock(); MapItemReplyPacket.DataBlock mrdata = new MapItemReplyPacket.DataBlock();
mrdata.X = replies[i].x; mrdata.X = replies[i].x;

2
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@ -133,7 +133,7 @@ namespace OpenSim.Region.Communications.Hypergrid
{ {
// Region doesn't exist here. Trying to link remote region // Region doesn't exist here. Trying to link remote region
m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort ); m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort);
regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random(); regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random();
if (!regionInfo.RegionID.Equals(UUID.Zero)) if (!regionInfo.RegionID.Equals(UUID.Zero))
{ {

2
OpenSim/Region/Communications/Local/LocalInventoryService.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
} }
else else
{ {
m_log.WarnFormat( "[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); m_log.WarnFormat("[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID);
} }
callback(folders, items); callback(folders, items);

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

@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.OGS1
// string externalUri = (string) responseData["sim_uri"]; // string externalUri = (string) responseData["sim_uri"];
//IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI ); regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI);
if (m_useRemoteRegionCache) if (m_useRemoteRegionCache)
{ {

6
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@ -231,7 +231,7 @@ namespace Flotsam.RegionModules.AssetCache
private void UpdateMemoryCache(string key, AssetBase asset) private void UpdateMemoryCache(string key, AssetBase asset)
{ {
if( m_MemoryCacheEnabled ) if (m_MemoryCacheEnabled)
{ {
if (m_MemoryExpiration > TimeSpan.Zero) if (m_MemoryExpiration > TimeSpan.Zero)
{ {
@ -405,7 +405,7 @@ namespace Flotsam.RegionModules.AssetCache
File.Delete(filename); File.Delete(filename);
} }
if( m_MemoryCacheEnabled ) if (m_MemoryCacheEnabled)
m_MemoryCache.Remove(id); m_MemoryCache.Remove(id);
} }
catch (Exception e) catch (Exception e)
@ -424,7 +424,7 @@ namespace Flotsam.RegionModules.AssetCache
Directory.Delete(dir); Directory.Delete(dir);
} }
if( m_MemoryCacheEnabled ) if (m_MemoryCacheEnabled)
m_MemoryCache.Clear(); m_MemoryCache.Clear();
} }

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
{ {
byte dialog = im.dialog; byte dialog = im.dialog;
if ( dialog != (byte)InstantMessageDialog.MessageFromAgent if (dialog != (byte)InstantMessageDialog.MessageFromAgent
&& dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StartTyping
&& dialog != (byte)InstantMessageDialog.StopTyping && dialog != (byte)InstantMessageDialog.StopTyping
&& dialog != (byte)InstantMessageDialog.MessageFromObject) && dialog != (byte)InstantMessageDialog.MessageFromObject)

6
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
else else
{ {
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
} }
} }
else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
else else
{ {
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
} }
} }
else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
else else
{ {
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
} }
} }
} }

4
OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
View File

@ -890,8 +890,8 @@ namespace OpenSim.Region.CoreModules.InterGrid
responseMap["sim_host"] = OSD.FromString(rezRespSim_host); responseMap["sim_host"] = OSD.FromString(rezRespSim_host);
responseMap["sim_port"] = OSD.FromInteger(rrPort); responseMap["sim_port"] = OSD.FromInteger(rrPort);
responseMap["region_x"] = OSD.FromInteger(rrX ); responseMap["region_x"] = OSD.FromInteger(rrX);
responseMap["region_y"] = OSD.FromInteger(rrY ); responseMap["region_y"] = OSD.FromInteger(rrY);
responseMap["region_id"] = OSD.FromUUID(rrRID); responseMap["region_id"] = OSD.FromUUID(rrRID);
responseMap["sim_access"] = OSD.FromString(rrAccess); responseMap["sim_access"] = OSD.FromString(rrAccess);

2
OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
View File

@ -511,7 +511,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (z_sort.ContainsKey(sortedlocalIds[s])) if (z_sort.ContainsKey(sortedlocalIds[s]))
{ {
DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]]; DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]];
for (int r = 0; r < rectDrawStruct.trns.Length; r++ ) for (int r = 0; r < rectDrawStruct.trns.Length; r++)
{ {
g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts); g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts);
} }

4
OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info ) public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info)
{ {
regionInfo = region_info; regionInfo = region_info;
osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes
private string Report() private string Report()
{ {
OSDMap args = new OSDMap(30); OSDMap args = new OSDMap(30);
//int time = Util.ToUnixTime( DateTime.Now ); //int time = Util.ToUnixTime(DateTime.Now);
args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
args["TimeZoneName"] = OSD.FromString(localZone); args["TimeZoneName"] = OSD.FromString(localZone);
args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours);

2
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
public IJ2KDecoder j2kdecode; public IJ2KDecoder j2kdecode;
private System.Threading.Thread thisthread; private System.Threading.Thread thisthread;
public void run( object o) public void run(object o)
{ {
for (int i=0;i<arrassets.Length;i++) for (int i=0;i<arrassets.Length;i++)
{ {

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -3325,7 +3325,7 @@ if (m_shape != null) {
bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0);
bool wasVD = VolumeDetectActive; bool wasVD = VolumeDetectActive;
if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD) ) if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD))
{ {
return; return;
} }
@ -3477,7 +3477,7 @@ if (m_shape != null) {
} }
else else
{ // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
// (mumbles, well, at least if you have infinte CPU powers :-) ) // (mumbles, well, at least if you have infinte CPU powers :-))
if (this.PhysActor != null) if (this.PhysActor != null)
{ {
PhysActor.SetVolumeDetect(0); PhysActor.SetVolumeDetect(0);

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2032,7 +2032,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID[] animIDs; UUID[] animIDs;
int[] sequenceNums; int[] sequenceNums;
UUID[] objectIDs; UUID[] objectIDs;
m_animations.GetArrays( out animIDs, out sequenceNums, out objectIDs); m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs);
return animIDs; return animIDs;
} }

8
OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
View File

@ -68,13 +68,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
entman.Add(sog); entman.Add(sog);
found = (SceneObjectGroup)entman[obj1]; found = (SceneObjectGroup)entman[obj1];
Assert.That(found.UUID ,Is.EqualTo(obj1) ); Assert.That(found.UUID ,Is.EqualTo(obj1));
found = (SceneObjectGroup)entman[li1]; found = (SceneObjectGroup)entman[li1];
Assert.That(found.UUID ,Is.EqualTo(obj1) ); Assert.That(found.UUID ,Is.EqualTo(obj1));
found = (SceneObjectGroup)entman[obj2]; found = (SceneObjectGroup)entman[obj2];
Assert.That(found.UUID ,Is.EqualTo(obj2) ); Assert.That(found.UUID ,Is.EqualTo(obj2));
found = (SceneObjectGroup)entman[li2]; found = (SceneObjectGroup)entman[li2];
Assert.That(found.UUID ,Is.EqualTo(obj2) ); Assert.That(found.UUID ,Is.EqualTo(obj2));
entman.Remove(obj1); entman.Remove(obj1);
entman.Remove(li2); entman.Remove(li2);

6
OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
View File

@ -404,7 +404,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
private bool IsAConnectionMatchFor(ChannelState cs) private bool IsAConnectionMatchFor(ChannelState cs)
{ {
return ( return (
Server == cs.Server && Server == cs.Server &&
IrcChannel == cs.IrcChannel && IrcChannel == cs.IrcChannel &&
Port == cs.Port && Port == cs.Port &&
@ -419,7 +419,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
private bool IsAPerfectMatchFor(ChannelState cs) private bool IsAPerfectMatchFor(ChannelState cs)
{ {
return ( IsAConnectionMatchFor(cs) && return (IsAConnectionMatchFor(cs) &&
RelayChannelOut == cs.RelayChannelOut && RelayChannelOut == cs.RelayChannelOut &&
PrivateMessageFormat == cs.PrivateMessageFormat && PrivateMessageFormat == cs.PrivateMessageFormat &&
NoticeMessageFormat == cs.NoticeMessageFormat && NoticeMessageFormat == cs.NoticeMessageFormat &&
@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
{ {
foreach (ChannelState cs in IRCBridgeModule.m_channels) foreach (ChannelState cs in IRCBridgeModule.m_channels)
{ {
if ( p_irc == cs.irc) if (p_irc == cs.irc)
{ {
// This non-IRC differentiator moved to here // This non-IRC differentiator moved to here

10
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
View File

@ -147,7 +147,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["int_response_code"] = 200; response["int_response_code"] = 200;
response["str_response_string"] = String.Format( response["str_response_string"] = String.Format(
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
"<document type=\"freeswitch/xml\">\r\n" + "<document type=\"freeswitch/xml\">\r\n" +
"<section name=\"directory\" description=\"User Directory\">\r\n" + "<section name=\"directory\" description=\"User Directory\">\r\n" +
@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["int_response_code"] = 200; response["int_response_code"] = 200;
response["str_response_string"] = String.Format( response["str_response_string"] = String.Format(
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
"<document type=\"freeswitch/xml\">\r\n" + "<document type=\"freeswitch/xml\">\r\n" +
"<section name=\"directory\" description=\"User Directory\">\r\n" + "<section name=\"directory\" description=\"User Directory\">\r\n" +
@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["int_response_code"] = 200; response["int_response_code"] = 200;
response["str_response_string"] = String.Format( response["str_response_string"] = String.Format(
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
"<document type=\"freeswitch/xml\">\r\n" + "<document type=\"freeswitch/xml\">\r\n" +
"<section name=\"directory\" description=\"User Directory\">\r\n" + "<section name=\"directory\" description=\"User Directory\">\r\n" +
@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["int_response_code"] = 200; response["int_response_code"] = 200;
response["str_response_string"] = String.Format( response["str_response_string"] = String.Format(
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
"<document type=\"freeswitch/xml\">\r\n" + "<document type=\"freeswitch/xml\">\r\n" +
"<section name=\"directory\" description=\"User Directory\">\r\n" + "<section name=\"directory\" description=\"User Directory\">\r\n" +
@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
// response["content_type"] = "text/xml"; // response["content_type"] = "text/xml";
// response["keepalive"] = false; // response["keepalive"] = false;
// response["int_response_code"] = 200; // response["int_response_code"] = 200;
// response["str_response_string"] = String.Format( // response["str_response_string"] = String.Format(
// "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + // "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
// "<document type=\"freeswitch/xml\">\r\n" + // "<document type=\"freeswitch/xml\">\r\n" +
// "<section name=\"directory\" description=\"User Directory\">\r\n" + // "<section name=\"directory\" description=\"User Directory\">\r\n" +

2
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -556,7 +556,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["str_response_string"] = String.Format( response["str_response_string"] = String.Format(
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
"<VCConfiguration>\r\n"+ "<VCConfiguration>\r\n"+
"<DefaultRealm>{0}</DefaultRealm>\r\n" + "<DefaultRealm>{0}</DefaultRealm>\r\n" +

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
View File

@ -1234,7 +1234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// UDP version doesn't seem to behave nicely. But we're going to send it out here // UDP version doesn't seem to behave nicely. But we're going to send it out here
// with an empty group membership to hopefully remove groups being displayed due // with an empty group membership to hopefully remove groups being displayed due
// to the core Groups Stub // to the core Groups Stub
remoteClient.SendGroupMembership( new GroupMembershipData[0] ); remoteClient.SendGroupMembership(new GroupMembershipData[0]);
GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray(); GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray();

2
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
View File

@ -115,7 +115,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
{ {
m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length); m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length);
m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage); m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage);
m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName ); m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName);
} }
public void DeleteAllMetaObjects() public void DeleteAllMetaObjects()

6
OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs
View File

@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
{ {
String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + String filename = m_repodir + Slash.DirectorySeparatorChar + regionid +
Slash.DirectorySeparatorChar + "heightmap.r32"; Slash.DirectorySeparatorChar + "heightmap.r32";
FileStream fs = new FileStream( filename, FileMode.Open); FileStream fs = new FileStream(filename, FileMode.Open);
StreamReader sr = new StreamReader(fs); StreamReader sr = new StreamReader(fs);
String result = sr.ReadToEnd(); String result = sr.ReadToEnd();
sr.Close(); sr.Close();
@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
{ {
String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + String filename = m_repodir + Slash.DirectorySeparatorChar + regionid +
Slash.DirectorySeparatorChar + "heightmap.r32"; Slash.DirectorySeparatorChar + "heightmap.r32";
FileStream fs = new FileStream( filename, FileMode.Open); FileStream fs = new FileStream(filename, FileMode.Open);
StreamReader sr = new StreamReader(fs); StreamReader sr = new StreamReader(fs);
String result = sr.ReadToEnd(); String result = sr.ReadToEnd();
sr.Close(); sr.Close();
@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
try try
{ {
logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; logLocation = revisionDir + Slash.DirectorySeparatorChar + "log";
fs = new FileStream( logLocation, FileMode.Open); fs = new FileStream(logLocation, FileMode.Open);
sr = new StreamReader(fs); sr = new StreamReader(fs);
logMessage = sr.ReadToEnd(); logMessage = sr.ReadToEnd();
sr.Close(); sr.Close();

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@ -170,7 +170,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
SceneObjectPart sop = GetSOP(); SceneObjectPart sop = GetSOP();
IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)]; IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)];
for (int i = 0; i < rets.Length;i++ ) for (int i = 0; i < rets.Length; i++)
{ {
rets[i] = new SOPObjectMaterial(i, sop); rets[i] = new SOPObjectMaterial(i, sop);
} }

2
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
View File

@ -459,7 +459,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
{ {
lock (m_prims) lock (m_prims)
{ {
foreach ( BulletDotNETPrim prim in m_prims) foreach (BulletDotNETPrim prim in m_prims)
{ {
if (prim.Body != null) if (prim.Body != null)
m_world.removeRigidBody(prim.Body); m_world.removeRigidBody(prim.Body);

4
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -429,8 +429,7 @@ namespace OpenSim.Region.Physics.Meshing
{ {
#if SPAM #if SPAM
m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " +
minSizeForComplexMesh.ToString() + " - creating simple bounding box");
minSizeForComplexMesh.ToString() + " - creating simple bounding box" );
#endif #endif
mesh = CreateBoundingBoxMesh(mesh); mesh = CreateBoundingBoxMesh(mesh);
mesh.DumpRaw(baseDir, primName, "Z extruded"); mesh.DumpRaw(baseDir, primName, "Z extruded");
@ -443,6 +442,5 @@ minSizeForComplexMesh.ToString() + " - creating simple bounding box" );
return mesh; return mesh;
} }
} }
} }

4
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -1116,7 +1116,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - " m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - "
+ (Shell!=IntPtr.Zero ? "Shell ":"") + (Shell!=IntPtr.Zero ? "Shell ":"")
+ (Body!=IntPtr.Zero ? "Body ":"") + (Body!=IntPtr.Zero ? "Body ":"")
+ (Amotor!=IntPtr.Zero ? "Amotor ":"") ); + (Amotor!=IntPtr.Zero ? "Amotor ":""));
} }
AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor); AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor);
@ -1182,7 +1182,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - "
+ (Shell==IntPtr.Zero ? "Shell ":"") + (Shell==IntPtr.Zero ? "Shell ":"")
+ (Body==IntPtr.Zero ? "Body ":"") + (Body==IntPtr.Zero ? "Body ":"")
+ (Amotor==IntPtr.Zero ? "Amotor ":"") ); + (Amotor==IntPtr.Zero ? "Amotor ":""));
} }
} }

4
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -2593,7 +2593,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
&& (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)
&& (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02)
&& (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01 )) && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01))
{ {
_zeroFlag = true; _zeroFlag = true;
m_throttleUpdates = false; m_throttleUpdates = false;
@ -2981,7 +2981,7 @@ namespace OpenSim.Region.Physics.OdePlugin
Matrix4 transposeMatrix = new Matrix4(); Matrix4 transposeMatrix = new Matrix4();
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)
Matrix4SetValue( ref transposeMatrix, i, j, pMat[j, i]); Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]);
return transposeMatrix; return transposeMatrix;
} }

4
OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs
View File

@ -234,7 +234,7 @@ namespace OpenSim.Region.Physics.OdePlugin
SetDefaultsForType(pType); SetDefaultsForType(pType);
Reset(); Reset();
} }
else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE ) else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE)
{ {
// Set properties // Set properties
SetDefaultsForType(pType); SetDefaultsForType(pType);
@ -408,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// m_bankingMix = 0.8f; // m_bankingMix = 0.8f;
// m_bankingTimescale = 1; // m_bankingTimescale = 1;
// m_referenceFrame = Quaternion.Identity; // m_referenceFrame = Quaternion.Identity;
m_flags &= ~( VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY |
VehicleFlag.LIMIT_MOTOR_UP); VehicleFlag.LIMIT_MOTOR_UP);
break; break;

2
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -3261,7 +3261,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight,
(int) heightmapWidthSamples, (int) heightmapHeightSamples, scale, (int) heightmapWidthSamples, (int) heightmapHeightSamples, scale,
offset, thickness, wrap); offset, thickness, wrap);
d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1 ); d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1);
LandGeom = d.CreateHeightfield(space, HeightmapData, 1); LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
if (LandGeom != IntPtr.Zero) if (LandGeom != IntPtr.Zero)
{ {

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2856,7 +2856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_TransferModule != null) if (m_TransferModule != null)
{ {
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
} }
ScriptSleep(2000); ScriptSleep(2000);
} }
@ -3668,7 +3668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bucket); bucket);
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
} }
else else
{ {
@ -5968,7 +5968,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bucket); bucket);
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
} }
public void llSetVehicleType(int type) public void llSetVehicleType(int type)
@ -6008,7 +6008,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!m_host.ParentGroup.IsDeleted) if (!m_host.ParentGroup.IsDeleted)
{ {
m_host.ParentGroup.RootPart.SetVehicleVectorParam(param, m_host.ParentGroup.RootPart.SetVehicleVectorParam(param,
new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z) ); new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z));
} }
} }
} }
@ -7039,7 +7039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return (double)Math.Log(val); return (double)Math.Log(val);
} }
public LSL_List llGetAnimationList( string id ) public LSL_List llGetAnimationList(string id)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -586,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Check for hostname , attempt to make a hglink // Check for hostname , attempt to make a hglink
// and convert the regionName to the target region // and convert the regionName to the target region
if ( regionName.Contains(".") && regionName.Contains(":")) if (regionName.Contains(".") && regionName.Contains(":"))
{ {
// Try to link the region // Try to link the region
RegionInfo regInfo = HGHyperlink.TryLinkRegion(World, RegionInfo regInfo = HGHyperlink.TryLinkRegion(World,

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
View File

@ -206,7 +206,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
// DO NOT THROW JUST THE INNER EXCEPTION! // DO NOT THROW JUST THE INNER EXCEPTION!
// FriendlyErrors depends on getting the whole exception! // FriendlyErrors depends on getting the whole exception!
// //
if ( !(tie.InnerException is EventAbortException) ) if (!(tie.InnerException is EventAbortException))
{ {
throw; throw;
} }

4
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
View File

@ -1407,7 +1407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
throw new PrologException(Atom.a("instantiation_error"), throw new PrologException(Atom.a("instantiation_error"),
"Arg 1 Char and arg 2 Code are both unbound variables"); "Arg 1 Char and arg 2 Code are both unbound variables");
return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt} ))); return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt})));
} }
else else
{ {
@ -2343,7 +2343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
string results = ""; string results = "";
for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch())
{ {
//m_log.Debug( m ); //m_log.Debug(m);
results += presep+ m + postsep; results += presep+ m + postsep;
} }
return results; return results;

12
OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
View File

@ -676,20 +676,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
// It's possible that we don't have an assignment, in which case // It's possible that we don't have an assignment, in which case
// the child will be null and we only print the semicolon. // the child will be null and we only print the semicolon.
// for ( x = 0 ; x < 10 ; x++ ) // for (x = 0; x < 10; x++)
// ^^^^^^^ // ^^^^^
ForLoopStatement s = (ForLoopStatement) fl.kids.Pop(); ForLoopStatement s = (ForLoopStatement) fl.kids.Pop();
if (null != s) if (null != s)
{ {
retstr += GenerateForLoopStatement(s); retstr += GenerateForLoopStatement(s);
} }
retstr += Generate("; "); retstr += Generate("; ");
// for ( x = 0 ; x < 10 ; x++ ) // for (x = 0; x < 10; x++)
// ^^^^^^^^ // ^^^^^^
retstr += GenerateNode((SYMBOL) fl.kids.Pop()); retstr += GenerateNode((SYMBOL) fl.kids.Pop());
retstr += Generate("; "); retstr += Generate("; ");
// for ( x = 0 ; x < 10 ; x++ ) // for (x = 0; x < 10; x++)
// ^^^^^ // ^^^
retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop()); retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop());
retstr += GenerateLine(")"); retstr += GenerateLine(")");

2
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@ -573,7 +573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
display--; display--;
string severity = "Error"; string severity = "Error";
if ( CompErr.IsWarning ) if (CompErr.IsWarning)
{ {
severity = "Warning"; severity = "Warning";
} }

2
OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs
View File

@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
// It's possible that a child is null, for instance when the // It's possible that a child is null, for instance when the
// assignment part in a for-loop is left out, ie: // assignment part in a for-loop is left out, ie:
// //
// for ( ; i < 10; i++) // for (; i < 10; i++)
// { // {
// ... // ...
// } // }

2
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@ -447,7 +447,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
// down-cast from Object to the correct type. // down-cast from Object to the correct type.
// Note: no checks for item index being valid are performed // Note: no checks for item index being valid are performed
public LSL_Types.LSLFloat GetLSLFloatItem( int itemIndex ) public LSL_Types.LSLFloat GetLSLFloatItem(int itemIndex)
{ {
if (m_data[itemIndex] is LSL_Types.LSLInteger) if (m_data[itemIndex] is LSL_Types.LSLInteger)
{ {

19
OpenSim/Region/UserStatistics/HTMLUtil.cs
View File

@ -43,6 +43,7 @@ namespace OpenSim.Region.UserStatistics
} }
o.Append(">\n\t"); o.Append(">\n\t");
} }
public static void TR_C(ref StringBuilder o) public static void TR_C(ref StringBuilder o)
{ {
o.Append("</tr>\n"); o.Append("</tr>\n");
@ -52,6 +53,7 @@ namespace OpenSim.Region.UserStatistics
{ {
TD_O(ref o, pclass, 0, 0); TD_O(ref o, pclass, 0, 0);
} }
public static void TD_O(ref StringBuilder o, string pclass, int rowspan, int colspan) public static void TD_O(ref StringBuilder o, string pclass, int rowspan, int colspan)
{ {
o.Append("<td"); o.Append("<td");
@ -73,10 +75,12 @@ namespace OpenSim.Region.UserStatistics
} }
o.Append(">"); o.Append(">");
} }
public static void TD_C(ref StringBuilder o) public static void TD_C(ref StringBuilder o)
{ {
o.Append("</td>"); o.Append("</td>");
} }
public static void TABLE_O(ref StringBuilder o, string pclass) public static void TABLE_O(ref StringBuilder o, string pclass)
{ {
o.Append("<table"); o.Append("<table");
@ -86,6 +90,7 @@ namespace OpenSim.Region.UserStatistics
} }
o.Append(">\n\t"); o.Append(">\n\t");
} }
public static void TABLE_C(ref StringBuilder o) public static void TABLE_C(ref StringBuilder o)
{ {
o.Append("</table>\n"); o.Append("</table>\n");
@ -208,24 +213,22 @@ namespace OpenSim.Region.UserStatistics
}); });
// ]]> // ]]>
</script>"); </script>");
} }
public static void HtmlHeaders_O ( ref StringBuilder o) public static void HtmlHeaders_O(ref StringBuilder o)
{ {
o.Append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"); o.Append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
o.Append("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"nl\">"); o.Append("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"nl\">");
o.Append("<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />"); o.Append("<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />");
} }
public static void HtmlHeaders_C ( ref StringBuilder o)
public static void HtmlHeaders_C(ref StringBuilder o)
{ {
o.Append("</HEAD>"); o.Append("</HEAD>");
o.Append("<BODY>"); o.Append("<BODY>");
} }
public static void AddReportLinks( ref StringBuilder o, Dictionary<string, IStatsController> reports, string pClass) public static void AddReportLinks(ref StringBuilder o, Dictionary<string, IStatsController> reports, string pClass)
{ {
int repcount = 0; int repcount = 0;
foreach (string str in reports.Keys) foreach (string str in reports.Keys)
@ -242,7 +245,8 @@ namespace OpenSim.Region.UserStatistics
} }
} }
} }
public static void A( ref StringBuilder o, string linktext, string linkhref, string pClass)
public static void A(ref StringBuilder o, string linktext, string linkhref, string pClass)
{ {
o.Append("<A"); o.Append("<A");
if (pClass.Length > 0) if (pClass.Length > 0)
@ -254,7 +258,6 @@ namespace OpenSim.Region.UserStatistics
o.Append("\">"); o.Append("\">");
o.Append(linktext); o.Append(linktext);
o.Append("</A>"); o.Append("</A>");
} }
} }
} }

2
OpenSim/Region/UserStatistics/LogLinesAJAX.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics
string formatopen = ""; string formatopen = "";
string formatclose = ""; string formatclose = "";
for (int i = 0; i < result.Length;i++ ) for (int i = 0; i < result.Length; i++)
{ {
if (result[i].Length >= 30) if (result[i].Length >= 30)
{ {

2
OpenSim/Region/UserStatistics/WebStatsModule.cs
View File

@ -398,7 +398,7 @@ namespace OpenSim.Region.UserStatistics
} }
public string readLogLines( int amount) public string readLogLines(int amount)
{ {
Encoding encoding = Encoding.ASCII; Encoding encoding = Encoding.ASCII;
int sizeOfChar = encoding.GetByteCount("\n"); int sizeOfChar = encoding.GetByteCount("\n");

2
OpenSim/Tests/Common/Mock/TestAssetCache.cs
View File

@ -103,7 +103,7 @@ namespace OpenSim.Tests.Common.Mock
public void AddAsset(AssetBase asset) public void AddAsset(AssetBase asset)
{ {
CreateAsset( asset ); CreateAsset(asset);
} }
public void ExpireAsset(UUID assetID) public void ExpireAsset(UUID assetID)

2
OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs
View File

@ -103,7 +103,7 @@ namespace OpenSim.Tests.Common.Setup
public static AssetBase CreateTestAsset() public static AssetBase CreateTestAsset()
{ {
byte[] expected = new byte[] { 1,2,3 }; byte[] expected = new byte[] { 1,2,3 };
AssetBase asset = new AssetBase( ); AssetBase asset = new AssetBase();
asset.ID = Guid.NewGuid().ToString(); asset.ID = Guid.NewGuid().ToString();
asset.Data = expected; asset.Data = expected;
asset.Type = 2; asset.Type = 2;

2
OpenSim/Tools/OpenSim.GridLaunch/GUI/WinForm/ProcessPanel.cs
View File

@ -194,7 +194,7 @@ namespace OpenSim.GridLaunch.GUI.WinForm
cblStartupComponents.Items.AddRange(arr); cblStartupComponents.Items.AddRange(arr);
// Now correct all check states // Now correct all check states
for (int i = 0; i < cblStartupComponents.Items.Count; i++ ) for (int i = 0; i < cblStartupComponents.Items.Count; i++)
{ {
string _name = cblStartupComponents.Items[i] as string; string _name = cblStartupComponents.Items[i] as string;
bool _checked = Program.Settings.Components[_name]; bool _checked = Program.Settings.Components[_name];

2
OpenSim/Tools/pCampBot/PhysicsBot.cs
View File

@ -379,7 +379,7 @@ namespace pCampBot
{ {
client.Assets.RequestImage(prim.Textures.DefaultTexture.TextureID, ImageType.Normal); client.Assets.RequestImage(prim.Textures.DefaultTexture.TextureID, ImageType.Normal);
} }
for (int i = 0; i < prim.Textures.FaceTextures.Length; i++ ) for (int i = 0; i < prim.Textures.FaceTextures.Length; i++)
{ {
if (prim.Textures.FaceTextures[i] != null) if (prim.Textures.FaceTextures[i] != null)
{ {