diff --git a/OpenSim/Data/Base/BaseDataReader.cs b/OpenSim/Data/Base/BaseDataReader.cs index da90f1029a..b71a966b5b 100644 --- a/OpenSim/Data/Base/BaseDataReader.cs +++ b/OpenSim/Data/Base/BaseDataReader.cs @@ -117,7 +117,7 @@ namespace OpenSim.Data.Base return m_source.GetGuid(m_source.GetOrdinal(name)); } - public UInt32 GetUInt32(string name ) + public UInt32 GetUInt32(string name) { return (UInt32)GetInt32(name); } @@ -129,9 +129,9 @@ namespace OpenSim.Data.Base return int32; } - public Int64 GetInt64(string name) + public Int64 GetInt64(string name) { - int ordinal = m_source.GetOrdinal( name ); + int ordinal = m_source.GetOrdinal(name); long int64 = m_source.GetInt64(ordinal); return int64; } diff --git a/OpenSim/Data/Base/BaseTableMapper.cs b/OpenSim/Data/Base/BaseTableMapper.cs index ad6000910b..649b22827f 100644 --- a/OpenSim/Data/Base/BaseTableMapper.cs +++ b/OpenSim/Data/Base/BaseTableMapper.cs @@ -125,7 +125,7 @@ namespace OpenSim.Data.Base // HACK: This is a temporary function used by TryGetValue(). // Due to a bug in mono 1.2.6, delegate blocks cannot contain - // a using() block. This has been fixed in SVN, so the next + // a using block. This has been fixed in SVN, so the next // mono release should work. private void TryGetConnectionValue(DbConnection connection, TPrimaryKey primaryKey, ref TRowMapper result, ref bool success) { @@ -137,7 +137,7 @@ namespace OpenSim.Data.Base { if (reader.Read()) { - result = FromReader( CreateReader(reader)); + result = FromReader(CreateReader(reader)); success = true; } else @@ -165,7 +165,7 @@ namespace OpenSim.Data.Base // HACK: This is a temporary function used by Remove(). // Due to a bug in mono 1.2.6, delegate blocks cannot contain - // a using() block. This has been fixed in SVN, so the next + // a using block. This has been fixed in SVN, so the next // mono release should work. protected virtual void TryDelete(DbConnection connection, TPrimaryKey id, ref int deleted) { @@ -215,7 +215,7 @@ namespace OpenSim.Data.Base // HACK: This is a temporary function used by Update(). // Due to a bug in mono 1.2.6, delegate blocks cannot contain - // a using() block. This has been fixed in SVN, so the next + // a using block. This has been fixed in SVN, so the next // mono release should work. protected void TryUpdate(DbConnection connection, TPrimaryKey primaryKey, TRowMapper value, ref int updated) { @@ -246,7 +246,7 @@ namespace OpenSim.Data.Base // HACK: This is a temporary function used by Add(). // Due to a bug in mono 1.2.6, delegate blocks cannot contain - // a using() block. This has been fixed in SVN, so the next + // a using block. This has been fixed in SVN, so the next // mono release should work. protected void TryAdd(DbConnection connection, TRowMapper value, ref int added) { diff --git a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs index 4c807b1fa5..bd683f384a 100644 --- a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs +++ b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs @@ -46,7 +46,7 @@ namespace OpenSim.Data.MSSQLMapper public override object ConvertToDbType(object value) { - if( value is UInt32 ) + if (value is UInt32) { UInt32 tmpVal = (UInt32) value; Int64 result = Convert.ToInt64(tmpVal); diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 1f95aadf01..4455c3b4c1 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -512,7 +512,7 @@ namespace OpenSim.Data.MySQL retval.FirstLifeImage = tmp; } - if(reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) + if (reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) { retval.WebLoginKey = LLUUID.Zero; } diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index b4487154fd..ab34f15ecd 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -69,7 +69,7 @@ namespace OpenSim.Data.MySQL string settingPort = iniFile.ParseFileReadValue("port"); m_usersTableName = iniFile.ParseFileReadValue("userstablename"); - if( m_usersTableName == null ) + if (m_usersTableName == null) { m_usersTableName = "users"; } diff --git a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs index 37b94fa3d8..b7940b846f 100644 --- a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs +++ b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs @@ -52,7 +52,7 @@ namespace OpenSim.Data.MySQLMapper public override BaseDataReader CreateReader(IDataReader reader) { - return new MySQLDataReader( reader ); + return new MySQLDataReader(reader); } } } \ No newline at end of file diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index e52f633b66..875f4e5f60 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs @@ -97,14 +97,14 @@ namespace OpenSim.Data.NHibernate string regex = @"no such table: Assets"; Regex RE = new Regex(regex, RegexOptions.Multiline); try { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { session.Load(typeof(AssetBase), LLUUID.Zero); } } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); - if(m.Success) { + if (m.Success) { // We don't have this table, so create it. new SchemaExport(cfg).Create(true, true); } @@ -113,7 +113,7 @@ namespace OpenSim.Data.NHibernate override public AssetBase FetchAsset(LLUUID uuid) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { try { return session.Load(typeof(AssetBase), uuid) as AssetBase; } catch { @@ -125,8 +125,8 @@ namespace OpenSim.Data.NHibernate override public void CreateAsset(AssetBase asset) { if (!ExistsAsset(asset.FullID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Save(asset); transaction.Commit(); } @@ -137,8 +137,8 @@ namespace OpenSim.Data.NHibernate override public void UpdateAsset(AssetBase asset) { if (ExistsAsset(asset.FullID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Update(asset); transaction.Commit(); } diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index f8e3655829..6ee1b4a4a6 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs @@ -95,14 +95,14 @@ namespace OpenSim.Data.NHibernate string regex = @"no such table: Inventory"; Regex RE = new Regex(regex, RegexOptions.Multiline); try { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { session.Load(typeof(InventoryItemBase), LLUUID.Zero); } } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); - if(m.Success) { + if (m.Success) { // We don't have this table, so create it. new SchemaExport(cfg).Create(true, true); } @@ -125,7 +125,7 @@ namespace OpenSim.Data.NHibernate /// A class containing item information public InventoryItemBase getInventoryItem(LLUUID item) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { try { return session.Load(typeof(InventoryItemBase), item) as InventoryItemBase; } catch { @@ -142,8 +142,8 @@ namespace OpenSim.Data.NHibernate public void addInventoryItem(InventoryItemBase item) { if (!ExistsItem(item.ID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Save(item); transaction.Commit(); } @@ -161,8 +161,8 @@ namespace OpenSim.Data.NHibernate public void updateInventoryItem(InventoryItemBase item) { if (ExistsItem(item.ID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Update(item); transaction.Commit(); } @@ -178,8 +178,8 @@ namespace OpenSim.Data.NHibernate /// public void deleteInventoryItem(LLUUID itemID) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Delete(itemID); transaction.Commit(); } @@ -194,7 +194,7 @@ namespace OpenSim.Data.NHibernate /// A class containing folder information public InventoryFolderBase getInventoryFolder(LLUUID folder) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { try { return session.Load(typeof(InventoryFolderBase), folder) as InventoryFolderBase; } catch { @@ -211,8 +211,8 @@ namespace OpenSim.Data.NHibernate public void addInventoryFolder(InventoryFolderBase folder) { if (!ExistsFolder(folder.ID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Save(folder); transaction.Commit(); } @@ -230,8 +230,8 @@ namespace OpenSim.Data.NHibernate public void updateInventoryFolder(InventoryFolderBase folder) { if (ExistsFolder(folder.ID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Update(folder); transaction.Commit(); } @@ -247,8 +247,8 @@ namespace OpenSim.Data.NHibernate /// public void deleteInventoryFolder(LLUUID folderID) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Delete(folderID.ToString()); transaction.Commit(); } @@ -324,10 +324,10 @@ namespace OpenSim.Data.NHibernate /// A List of InventoryItemBase items public List getInventoryInFolder(LLUUID folderID) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { // try { ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase)); - criteria.Add(Expression.Eq("Folder", folderID) ); + criteria.Add(Expression.Eq("Folder", folderID)); List list = new List(); foreach (InventoryItemBase item in criteria.List()) { @@ -348,11 +348,11 @@ namespace OpenSim.Data.NHibernate // see InventoryItemBase.getUserRootFolder public InventoryFolderBase getUserRootFolder(LLUUID user) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { // try { ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); - criteria.Add(Expression.Eq("ParentID", LLUUID.Zero) ); - criteria.Add(Expression.Eq("Owner", user) ); + criteria.Add(Expression.Eq("ParentID", LLUUID.Zero)); + criteria.Add(Expression.Eq("Owner", user)); foreach (InventoryFolderBase folder in criteria.List()) { return folder; @@ -372,10 +372,10 @@ namespace OpenSim.Data.NHibernate /// ID of parent private void getInventoryFolders(ref List folders, LLUUID parentID) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { // try { ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); - criteria.Add(Expression.Eq("ParentID", parentID) ); + criteria.Add(Expression.Eq("ParentID", parentID)); foreach (InventoryFolderBase item in criteria.List()) { folders.Add(item); diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index e680840252..2c84ef9541 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs @@ -88,14 +88,14 @@ namespace OpenSim.Data.NHibernate string regex = @"no such table: UserProfiles"; Regex RE = new Regex(regex, RegexOptions.Multiline); try { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { session.Load(typeof(UserProfileData), LLUUID.Zero); } } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); - if(m.Success) { + if (m.Success) { // We don't have this table, so create it. new SchemaExport(cfg).Create(true, true); } @@ -106,7 +106,7 @@ namespace OpenSim.Data.NHibernate { UserProfileData user = null; try { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; } // BUG: CATCHALL IS BAD. @@ -119,7 +119,7 @@ namespace OpenSim.Data.NHibernate { UserProfileData user; // TODO: I'm sure I'll have to do something silly here - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; user.CurrentAgent = GetAgentByUUID(uuid); } @@ -129,8 +129,8 @@ namespace OpenSim.Data.NHibernate override public void AddNewUserProfile(UserProfileData profile) { if (!ExistsUser(profile.ID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Save(profile); SetAgentData(profile.ID, profile.CurrentAgent, session); // TODO: save agent @@ -166,8 +166,8 @@ namespace OpenSim.Data.NHibernate override public bool UpdateUserProfile(UserProfileData profile) { if (ExistsUser(profile.ID)) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Update(profile); SetAgentData(profile.ID, profile.CurrentAgent, session); transaction.Commit(); @@ -183,8 +183,8 @@ namespace OpenSim.Data.NHibernate override public void AddNewUserAgent(UserAgentData agent) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Save(agent); transaction.Commit(); } @@ -193,8 +193,8 @@ namespace OpenSim.Data.NHibernate public void UpdateUserAgent(UserAgentData agent) { - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { session.Update(agent); transaction.Commit(); } @@ -206,7 +206,7 @@ namespace OpenSim.Data.NHibernate override public UserAgentData GetAgentByUUID(LLUUID uuid) { try { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { return session.Load(typeof(UserAgentData), uuid) as UserAgentData; } } catch { @@ -216,7 +216,7 @@ namespace OpenSim.Data.NHibernate override public UserProfileData GetUserByName(string fname, string lname) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { ICriteria criteria = session.CreateCriteria(typeof(UserProfileData)); criteria.Add(Expression.Eq("FirstName", fname)); criteria.Add(Expression.Eq("SurName", lname)); @@ -247,11 +247,11 @@ namespace OpenSim.Data.NHibernate if (querysplit.Length == 2) { - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { ICriteria criteria = session.CreateCriteria(typeof(UserProfileData)); criteria.Add(Expression.Like("FirstName", querysplit[0])); criteria.Add(Expression.Like("SurName", querysplit[1])); - foreach(UserProfileData profile in criteria.List()) + foreach (UserProfileData profile in criteria.List()) { AvatarPickerAvatar user = new AvatarPickerAvatar(); user.AvatarID = profile.ID; @@ -280,7 +280,7 @@ namespace OpenSim.Data.NHibernate { UserAppearance appearance; // TODO: I'm sure I'll have to do something silly here - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { appearance = session.Load(typeof(UserAppearance), user) as UserAppearance; } return appearance; @@ -289,7 +289,7 @@ namespace OpenSim.Data.NHibernate private bool ExistsAppearance(LLUUID uuid) { UserAppearance appearance; - using(ISession session = factory.OpenSession()) { + using (ISession session = factory.OpenSession()) { appearance = session.Load(typeof(UserAppearance), uuid) as UserAppearance; } return (appearance == null) ? false : true; @@ -299,8 +299,8 @@ namespace OpenSim.Data.NHibernate override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) { bool exists = ExistsAppearance(user); - using(ISession session = factory.OpenSession()) { - using(ITransaction transaction = session.BeginTransaction()) { + using (ISession session = factory.OpenSession()) { + using (ITransaction transaction = session.BeginTransaction()) { if (exists) { session.Update(appearance); } else { diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs index fe49978464..cb3d33de09 100644 --- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs +++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs @@ -143,7 +143,7 @@ namespace OpenSim.Data PrimitiveBaseShape shape = new PrimitiveBaseShape(); PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape); - mapper.FillObject( reader ); + mapper.FillObject(reader); return mapper; } @@ -162,7 +162,7 @@ namespace OpenSim.Data private PrimitiveBaseShapeRowMapper CreateRowMapper(Guid sceneObjectPartId, PrimitiveBaseShape primitiveBaseShape) { - PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper( m_schema, primitiveBaseShape ); + PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, primitiveBaseShape); mapper.SceneObjectPartId = sceneObjectPartId; return mapper; } diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index fa5d5e24b7..f3a4bd188a 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs @@ -155,7 +155,7 @@ namespace OpenSim.Data.SQLite cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(uuid))); using (IDataReader reader = cmd.ExecuteReader()) { - if(reader.Read()) + if (reader.Read()) { reader.Close(); return true; diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 399b3b98f7..705f369482 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -196,7 +196,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// public void DeregisterHandlers() { - foreach(string capsName in m_capsHandlers.Caps) + foreach (string capsName in m_capsHandlers.Caps) { m_capsHandlers.Remove(capsName); } diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs index 13361c712d..e8692676be 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs @@ -37,7 +37,7 @@ using libsecondlife; namespace OpenSim.Framework.Communications.Capabilities { /// - /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code. + /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code. /// public static class LLSD { diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 018b51f5f4..82002c2c85 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs @@ -31,7 +31,7 @@ namespace OpenSim.Framework { public delegate void restart(RegionInfo thisRegion); - //public delegate void regionup ( RegionInfo thisRegion ); + //public delegate void regionup (RegionInfo thisRegion); public enum RegionStatus : int { diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 5eac9de5dd..af8efe8aad 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs @@ -163,7 +163,7 @@ namespace OpenSim.Framework { PacketType type=packet.Type; - if(pool[type] == null) + if (pool[type] == null) { pool[type] = new Stack(); } diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 88c9ea6b0a..8380633a6a 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -122,7 +122,7 @@ namespace OpenSim.Framework get { // Old one defaults to IPv6 - //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port ); + //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port); IPAddress ia = null; // If it is already an IP, don't resolve it - just return directly diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs index 97aa8db75e..a87d5ef171 100644 --- a/OpenSim/Framework/SerializableRegionInfo.cs +++ b/OpenSim/Framework/SerializableRegionInfo.cs @@ -116,7 +116,7 @@ namespace OpenSim.Framework get { // Old one defaults to IPv6 - //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port ); + //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port); IPAddress ia = null; // If it is already an IP, don't resolve it - just return directly diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 2f495a992f..f36b2fb740 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -412,7 +412,7 @@ namespace OpenSim.Framework.Servers public void HandleHTTPRequest(HttpListenerRequest request, HttpListenerResponse response) { - switch( request.HttpMethod ) + switch (request.HttpMethod) { case "OPTIONS": response.StatusCode = 200; diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index b8ad83a9c8..344309d950 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -54,9 +54,9 @@ namespace OpenSim.Framework.Servers /// public virtual void Shutdown() { - if(m_console != null) + if (m_console != null) { - m_console.Close(); + m_console.Close(); } Environment.Exit(0); } @@ -112,7 +112,7 @@ namespace OpenSim.Framework.Servers /// private void Notice(string msg) { - if(m_console != null) + if (m_console != null) { m_console.Notice(msg); } diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 84a515ce4e..c2c212c50b 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -371,7 +371,7 @@ namespace OpenSim.Grid.GridServer catch (FormatException e) { m_log.Warn("[LOGIN PRELUDE]: Invalid login parameters, sending back error response."); - return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString() ); + return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString()); } m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName); @@ -406,7 +406,7 @@ namespace OpenSim.Grid.GridServer { DataResponse insertResponse; - if( existingSim == null ) + if (existingSim == null) { insertResponse = kvp.Value.AddProfile(sim); } diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index aeaead5261..88a9561f09 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs @@ -87,7 +87,7 @@ namespace OpenSim.Grid.GridServer AddHttpHandlers(); - LoadGridPlugins( ); + LoadGridPlugins(); m_httpServer.Start(); diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs index da359a795a..b6b2b64245 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs @@ -39,7 +39,7 @@ namespace OpenGridServices.Manager protected virtual void OnResponse(object o, Gtk.ResponseArgs args) { - switch(args.ResponseId) { + switch (args.ResponseId) { case Gtk.ResponseType.Ok: MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); break; diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs index 995dd8c053..a386fa84c8 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs @@ -55,7 +55,7 @@ namespace OpenGridServices.Manager LoginParams.Add(LoginParamsHT); XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); - if(GridResp.IsFault) { + if (GridResp.IsFault) { connected=false; return false; } else { @@ -87,14 +87,15 @@ namespace OpenGridServices.Manager // TODO - ERROR! } - for(int i=0; i<=rootnode.ChildNodes.Count; i++) + for (int i = 0; i <= rootnode.ChildNodes.Count; i++) { - if(rootnode.ChildNodes.Item(i).Name != "region") { + if (rootnode.ChildNodes.Item(i).Name != "region") + { // TODO - ERROR! - } else { + } + else + { TempRegionData = new RegionBlock(); - - } } } @@ -112,8 +113,8 @@ namespace OpenGridServices.Manager ShutdownParamsHT["session_id"]=this.SessionID.ToString(); ShutdownParams.Add(ShutdownParamsHT); XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); - XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL,3000); - if(GridResp.IsFault) { + XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); + if (GridResp.IsFault) { return false; } else { connected=false; diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs index 33e577daf5..6b7a5ab94a 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs @@ -45,7 +45,7 @@ namespace OpenGridServices.Manager public static void DoMainLoop() { - while(!QuitReq) + while (!QuitReq) { Application.RunIteration(); } @@ -57,15 +57,15 @@ namespace OpenGridServices.Manager string cmd; char[] sep = new char[1]; sep[0]=' '; - while(!QuitReq) + while (!QuitReq) { operation=PendingOperations.Dequeue(); Console.WriteLine(operation); cmd = operation.Split(sep)[0]; - switch(cmd) { + switch (cmd) { case "connect_to_gridserver": win.SetStatus("Connecting to grid server..."); - if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) { + if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) { win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); win.SetGridServerConnected(true); Thread.Sleep(3000); @@ -78,7 +78,7 @@ namespace OpenGridServices.Manager case "restart_gridserver": win.SetStatus("Restarting grid server..."); - if(gridserverConn.RestartServer()) { + if (gridserverConn.RestartServer()) { win.SetStatus("Restarted server OK"); Thread.Sleep(3000); win.SetStatus(""); @@ -89,7 +89,7 @@ namespace OpenGridServices.Manager case "shutdown_gridserver": win.SetStatus("Shutting down grid server..."); - if(gridserverConn.ShutdownServer()) { + if (gridserverConn.ShutdownServer()) { win.SetStatus("Grid server shutdown"); win.SetGridServerConnected(false); Thread.Sleep(3000); diff --git a/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs index 764c1abe9b..3411465aa9 100644 --- a/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs @@ -364,21 +364,21 @@ namespace OpenSim.Grid.ScriptEngine.Common List llList2List(List src, int start, int end); //wiki: llDeleteSubList(list src, integer start, integer end) List llDeleteSubList(List src, int start, int end); - //wiki: integer llGetListEntryType( list src, integer index ) + //wiki: integer llGetListEntryType(list src, integer index) int llGetListEntryType(List src, int index); - //wiki: string llList2CSV( list src ) + //wiki: string llList2CSV(list src) string llList2CSV(List src); - //wiki: list llCSV2List( string src ) + //wiki: list llCSV2List(string src) List llCSV2List(string src); - //wiki: list llListRandomize( list src, integer stride ) + //wiki: list llListRandomize(list src, integer stride) List llListRandomize(List src, int stride); - //wiki: list llList2ListStrided( list src, integer start, integer end, integer stride ) + //wiki: list llList2ListStrided(list src, integer start, integer end, integer stride) List llList2ListStrided(List src, int start, int end, int stride); - //wiki: vector llGetRegionCorner( ) + //wiki: vector llGetRegionCorner() LSL_Types.Vector3 llGetRegionCorner(); - //wiki: list llListInsertList( list dest, list src, integer start ) + //wiki: list llListInsertList(list dest, list src, integer start) List llListInsertList(List dest, List src, int start); - //wiki: integer llListFindList( list src, list test ) + //wiki: integer llListFindList(list src, list test) int llListFindList(List src, List test); //wiki: string llGetObjectName() string llGetObjectName(); @@ -469,7 +469,7 @@ namespace OpenSim.Grid.ScriptEngine.Common void llDumpList2String(); //wiki: integer llScriptDanger(vector pos) void llScriptDanger(LSL_Types.Vector3 pos); - //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) + //wiki: llDialog(key avatar, string message, list buttons, integer chat_channel) void llDialog(string avatar, string message, List buttons, int chat_channel); //wiki: llVolumeDetect(integer detect) void llVolumeDetect(int detect); @@ -493,7 +493,7 @@ namespace OpenSim.Grid.ScriptEngine.Common void llCloseRemoteDataChannel(string channel); //wiki: string llMD5String(string src, integer nonce) string llMD5String(string src, int nonce); - //wiki: llSetPrimitiveParams( list rules ) + //wiki: llSetPrimitiveParams(list rules) void llSetPrimitiveParams(List rules); //wiki: string llStringToBase64(string str) string llStringToBase64(string str); @@ -507,7 +507,7 @@ namespace OpenSim.Grid.ScriptEngine.Common double llLog10(double val); //wiki: double llLog(double val) double llLog(double val); - //wiki: list llGetAnimationList( key id ) + //wiki: list llGetAnimationList(key id) List llGetAnimationList(string id); //wiki: llSetParcelMusicURL(string url) void llSetParcelMusicURL(string url); @@ -529,7 +529,7 @@ namespace OpenSim.Grid.ScriptEngine.Common int llGetNumberOfPrims(); //wiki: key llGetNumberOfNotecardLines(string name) string llGetNumberOfNotecardLines(string name); - //wiki: list llGetBoundingBox( key object ) + //wiki: list llGetBoundingBox(key object) List llGetBoundingBox(string obj); //wiki: vector llGetGeometricCenter() LSL_Types.Vector3 llGetGeometricCenter(); @@ -544,7 +544,7 @@ namespace OpenSim.Grid.ScriptEngine.Common string llGetSimulatorHostname(); //llSetLocalRot(rotation rot) void llSetLocalRot(LSL_Types.Quaternion rot); - //wiki: list llParseStringKeepNulls( string src, list separators, list spacers ) + //wiki: list llParseStringKeepNulls(string src, list separators, list spacers) List llParseStringKeepNulls(string src, List seperators, List spacers); //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param) void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, @@ -571,14 +571,14 @@ namespace OpenSim.Grid.ScriptEngine.Common void llListReplaceList(); //wiki: llLoadURL(key avatar_id, string message, string url) void llLoadURL(string avatar_id, string message, string url); - //wiki: llParcelMediaCommandList( list commandList ) + //wiki: llParcelMediaCommandList(list commandList) void llParcelMediaCommandList(List commandList); void llParcelMediaQuery(); //wiki integer llModPow(integer a, integer b, integer c) int llModPow(int a, int b, int c); //wiki: integer llGetInventoryType(string name) int llGetInventoryType(string name); - //wiki: llSetPayPrice( integer price, list quick_pay_buttons ) + //wiki: llSetPayPrice(integer price, list quick_pay_buttons) void llSetPayPrice(int price, List quick_pay_buttons); //wiki: vector llGetCameraPos() LSL_Types.Vector3 llGetCameraPos(); @@ -600,11 +600,11 @@ namespace OpenSim.Grid.ScriptEngine.Common void llRemoveFromLandPassList(string avatar); //wiki: llRemoveFromLandBanList(key avatar) void llRemoveFromLandBanList(string avatar); - //wiki: llSetCameraParams( list rules ) + //wiki: llSetCameraParams(list rules) void llSetCameraParams(List rules); //wiki: llClearCameraParams() void llClearCameraParams(); - //wiki: double llListStatistics( integer operation, list src ) + //wiki: double llListStatistics(integer operation, list src) double llListStatistics(int operation, List src); //wiki: integer llGetUnixTime() int llGetUnixTime(); @@ -621,11 +621,11 @@ namespace OpenSim.Grid.ScriptEngine.Common void llResetLandPassList(); //wiki integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); - //wiki: list llGetParcelPrimOwners( vector pos ) + //wiki: list llGetParcelPrimOwners(vector pos) List llGetParcelPrimOwners(LSL_Types.Vector3 pos); //wiki: integer llGetObjectPrimCount(key object_id) int llGetObjectPrimCount(string object_id); - //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide ) + //wiki: integer llGetParcelMaxPrims(vector pos, integer sim_wide) int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); //wiki list llGetParcelDetails(vector pos, list params) List llGetParcelDetails(LSL_Types.Vector3 pos, List param); diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 3b5ecb58f7..64d34938eb 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs @@ -1333,7 +1333,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler if (chunk.Count > 0) tmp.Add(chunk); - // Decreate (<- what kind of word is that? :D ) array back into a list + // Decreate (<- what kind of word is that? :D) array back into a list int rnd; List ret = new List(); while (tmp.Count > 0) diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs index 216240360a..0f29bbe7e6 100644 --- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs +++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs @@ -65,7 +65,7 @@ namespace OpenUser.Config.UserConfigDb4o { db = Db4oFactory.OpenFile("openuser.yap"); IObjectSet result = db.Get(typeof(DbUserConfig)); - if(result.Count==1) + if (result.Count == 1) { m_log.Info("[DBUSERCONFIG]: DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); foreach (DbUserConfig cfg in result) diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index e1ccd020b0..7cd243172a 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -266,8 +266,8 @@ namespace OpenSim.Grid.UserServer float positionZ, string firstname, string lastname) { - m_messagesService.TellMessageServersAboutUser( agentID, sessionID, RegionID, regionhandle, positionX, - positionY, positionZ, firstname, lastname); + m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX, + positionY, positionZ, firstname, lastname); } } } diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 28f5c4cecc..4e9728e245 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs @@ -159,7 +159,7 @@ namespace OpenSim.Grid.UserServer ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname) { - // Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D ) + // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D) lock (MessageServers) { if (MessageServers.Count > 0) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b8f055e43d..af20687e8a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -1204,11 +1204,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendPayPrice(LLUUID objectID, int[] payPrice) { - if(payPrice[0] == 0 && - payPrice[1] == 0 && - payPrice[2] == 0 && - payPrice[3] == 0 && - payPrice[4] == 0) + if (payPrice[0] == 0 && + payPrice[1] == 0 && + payPrice[2] == 0 && + payPrice[3] == 0 && + payPrice[4] == 0) return; PayPriceReplyPacket payPriceReply = (PayPriceReplyPacket)PacketPool.Instance.GetPacket(PacketType.PayPriceReply); @@ -3094,7 +3094,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP return true; } - public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) { ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); @@ -3108,13 +3107,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(scriptQuestion, ThrottleOutPacketType.Task); } + private void InitDefaultAnimations() { } public LLUUID GetDefaultAnimation(string name) { - if(m_defaultAnimations.ContainsKey(name)) + if (m_defaultAnimations.ContainsKey(name)) return m_defaultAnimations[name]; return LLUUID.Zero; } @@ -3318,8 +3318,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; if (handlerUpdatePrimGroupScale != null) { - - // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z ); + // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); handlerUpdatePrimGroupScale(localId, scale5, this); handlerUpdateVector = OnUpdatePrimGroupPosition; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 95510e1862..5f83b50794 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -369,7 +369,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected virtual void AddNewClient(Packet packet) { //Slave regions don't accept new clients - if(m_localScene.Region_Status != RegionStatus.SlaveScene) + if (m_localScene.Region_Status != RegionStatus.SlaveScene) { UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; lock (clientCircuits) diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index c48292aaf1..b2550af93e 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -91,7 +91,7 @@ namespace OpenSim.Region.Communications.Local //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); if (!m_regions.ContainsKey(regionInfo.RegionHandle)) { - //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle ); + //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle); m_regions.Add(regionInfo.RegionHandle, regionInfo); RegionCommsListener regionHost = new RegionCommsListener(); @@ -180,7 +180,7 @@ namespace OpenSim.Region.Communications.Local public RegionInfo RequestClosestRegion(string regionName) { - foreach(RegionInfo regInfo in m_regions.Values) + foreach (RegionInfo regInfo in m_regions.Values) { if (regInfo.RegionName == regionName) return regInfo; } diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index c7ee2336c2..1b50bbd207 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs @@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer { if (Data.Length < 1000) { - // for now (testing ) we only support files under 1000 bytes + // for now (testing) we only support files under 1000 bytes byte[] transferData = new byte[Data.Length + 4]; Array.Copy(Helpers.IntToBytes(Data.Length), 0, transferData, 0, 4); Array.Copy(Data, 0, transferData, 4, Data.Length); diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 0236e5fbe2..b319370f7c 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -278,7 +278,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land list.Add(entry.AgentID); } } - if(list.Count == 0) + if (list.Count == 0) { list.Add(LLUUID.Zero); } diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 2900b8c803..44f5c2d855 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -220,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions } protected void DebugPermissionInformation(string permissionCalled) { - if(m_debugPermissions) + if (m_debugPermissions) m_log.Info("[PERMISSIONS]: " + permissionCalled + " was called from " + m_scene.RegionInfo.RegionName); } @@ -240,7 +240,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions if (user != LLUUID.Zero) { LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers; - foreach(LLUUID estatemanager in estatemanagers) + foreach (LLUUID estatemanager in estatemanagers) { if (estatemanager == user) return true; diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index 03145622d3..beb74ce5b7 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.Environment.Modules private double d_day_length = 4; // A VW day is 4 RW hours long private int d_year_length = 60; // There are 60 VW days in a VW year private double d_day_night = 0.45; // axis offset: ratio of light-to-dark, approx 1:3 - private double d_longitude = -73.53; + private double d_longitude = -73.53; private double d_latitude = 41.29; // Frame counter @@ -155,48 +155,44 @@ namespace OpenSim.Region.Environment.Modules m_longitude = d_longitude; } - switch(m_mode) + switch (m_mode) { + case "T1": + default: + case "SL": + // Time taken to complete a cycle (day and season) - case "T1" : + SecondsPerSunCycle = (uint) (m_day_length * 60 * 60); + SecondsPerYear = (uint) (SecondsPerSunCycle*m_year_length); - default : + // Ration of real-to-virtual time - case "SL" : - // Time taken to complete a cycle (day and season) + VWTimeRatio = 24/m_day_length; - SecondsPerSunCycle = (uint) (m_day_length * 60 * 60); - SecondsPerYear = (uint) (SecondsPerSunCycle*m_year_length); + // Speed of rotation needed to complete a cycle in the + // designated period (day and season) - // Ration of real-to-virtual time + SunSpeed = SunCycle/SecondsPerSunCycle; + SeasonSpeed = SeasonalCycle/SecondsPerYear; - VWTimeRatio = 24/m_day_length; + // Horizon translation - // Speed of rotation needed to complete a cycle in the - // designated period (day and season) + HorizonShift = m_day_night; // Z axis translation + HoursToRadians = (SunCycle/24)*VWTimeRatio; - SunSpeed = SunCycle/SecondsPerSunCycle; - SeasonSpeed = SeasonalCycle/SecondsPerYear; + // Insert our event handling hooks - // Horizon translation + scene.EventManager.OnFrame += SunUpdate; + scene.EventManager.OnNewClient += SunToClient; - HorizonShift = m_day_night; // Z axis translation - HoursToRadians = (SunCycle/24)*VWTimeRatio; + ready = true; - // Insert our event handling hooks - - scene.EventManager.OnFrame += SunUpdate; - scene.EventManager.OnNewClient += SunToClient; - - ready = true; - - m_log.Debug("[SUN] Mode is "+m_mode); - m_log.Debug("[SUN] Initialization completed. Day is "+SecondsPerSunCycle+" seconds, and year is "+m_year_length+" days"); - m_log.Debug("[SUN] Axis offset is "+m_day_night); - m_log.Debug("[SUN] Positional data updated every "+m_frame_mod+" frames"); + m_log.Debug("[SUN] Mode is "+m_mode); + m_log.Debug("[SUN] Initialization completed. Day is "+SecondsPerSunCycle+" seconds, and year is "+m_year_length+" days"); + m_log.Debug("[SUN] Axis offset is "+m_day_night); + m_log.Debug("[SUN] Positional data updated every "+m_frame_mod+" frames"); break; - } } @@ -224,21 +220,20 @@ namespace OpenSim.Region.Environment.Modules public void SunToClient(IClientAPI client) { - if(m_mode != "T1") + if (m_mode != "T1") { - if(ready) - { - GenSunPos(); // Generate shared values once - client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition); + if (ready) + { + GenSunPos(); // Generate shared values once + client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition); m_log.Debug("[SUN] Initial update for new client"); - } + } } } public void SunUpdate() { - - if(((m_frame++%m_frame_mod) != 0) || !ready) + if (((m_frame++%m_frame_mod) != 0) || !ready) { return; } @@ -253,7 +248,6 @@ namespace OpenSim.Region.Environment.Modules // set estate settings for region access to sun position m_scene.RegionInfo.EstateSettings.sunPosition = Position; - } /// diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 49ce341081..efd258dfe7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -596,7 +596,7 @@ namespace OpenSim.Region.Environment.Scenes ScenePresence presence; TryGetAvatar(remoteClient.AgentId, out presence); byte[] data = null; - if(invType == 3 && presence != null) // libsecondlife.asset.assettype.landmark = 3 - needs to be turned into an enum + if (invType == 3 && presence != null) // libsecondlife.asset.assettype.landmark = 3 - needs to be turned into an enum { LLVector3 pos=presence.AbsolutePosition; string strdata=String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n", @@ -996,7 +996,7 @@ namespace OpenSim.Region.Environment.Scenes permissionToDelete = false; //Just taking copy! } - else if(DeRezPacket.AgentBlock.Destination == 4) //Take + else if (DeRezPacket.AgentBlock.Destination == 4) //Take { // Take permissionToTake = ExternalChecks.ExternalChecksCanTakeObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index c9274dd4f7..f922f1f634 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -452,7 +452,7 @@ namespace OpenSim.Region.Environment.Scenes d); } - public delegate void SendCloseChildAgentDelegate( LLUUID agentID, List regionlst); + public delegate void SendCloseChildAgentDelegate(LLUUID agentID, List regionlst); /// /// This Closes child agents on neighboring regions @@ -568,7 +568,8 @@ namespace OpenSim.Region.Environment.Scenes // assume local regions are always up destRegionUp = true; } - if(destRegionUp) + + if (destRegionUp) { avatar.Close(); diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs index 285ee0d8ed..99d19df454 100644 --- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs +++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment.Scenes public void addCheckRezObject(CanRezObject delegateFunc) { - if(!CanRezObjectCheckFunctions.Contains(delegateFunc)) + if (!CanRezObjectCheckFunctions.Contains(delegateFunc)) CanRezObjectCheckFunctions.Add(delegateFunc); } public void removeCheckRezObject(CanRezObject delegateFunc) diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 8603ccc13b..1f1f39fc20 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes { foreach (Scene mscene in m_localScenes) { - if((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) && + if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) && (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port)) { scene = mscene; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 1dbac523f5..9a9314c87d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -263,7 +263,7 @@ namespace OpenSim.Region.Environment.Scenes { foreach (TaskInventoryItem item in m_taskInventory.Values) { - if(item.Name == name) + if (item.Name == name) return true; } return false; @@ -271,14 +271,14 @@ namespace OpenSim.Region.Environment.Scenes private string FindAvailableInventoryName(string name) { - if(!InventoryContainsName(name)) + if (!InventoryContainsName(name)) return name; int suffix=1; - while(suffix < 256) + while (suffix < 256) { string tryName=String.Format("{0} {1}", name, suffix); - if(!InventoryContainsName(tryName)) + if (!InventoryContainsName(tryName)) return tryName; suffix++; } @@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes item.ParentPartID = UUID; string name=FindAvailableInventoryName(item.Name); - if(name == String.Empty) + if (name == String.Empty) return; item.Name=name; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 9502627144..6c5a68dff0 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -2049,7 +2049,7 @@ namespace OpenSim.Region.Environment.Scenes data[pos] = (byte)pTexAnim.SizeY; pos++; Helpers.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); - Helpers.FloatToBytes(pTexAnim.Length ).CopyTo(data, pos + 4); + Helpers.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4); Helpers.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); m_TextureAnimation = data; @@ -2495,7 +2495,7 @@ namespace OpenSim.Region.Environment.Scenes (int) (color.x*0xff), (int) (color.y*0xff), (int) (color.z*0xff)); - SetText( text ); + SetText(text); } public int registerTargetWaypoint(LLVector3 target, float tolerance) diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 6f0fbdf1ba..2901a975c9 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -1263,7 +1263,7 @@ namespace OpenSim.Region.Environment.Scenes //bool colliding = (m_physicsActor.IsColliding==true); //if (controlland) // m_log.Info("[AGENT]: landCommand"); - //if (colliding ) + //if (colliding) // m_log.Info("[AGENT]: colliding"); //if (m_physicsActor.Flying && colliding && controlland) //{ diff --git a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs index 656f12e646..6a18091501 100644 --- a/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs @@ -60,7 +60,7 @@ namespace OpenSim.Region.Examples.SimpleModule float cpu = m_counter.NextValue()/40f; LLVector3 size = new LLVector3(cpu, cpu, cpu); - RootPart.Resize( size ); + RootPart.Resize(size); base.UpdateMovement(); } diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs index 6e9fe6d5b0..81abb3fb26 100644 --- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs +++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs @@ -103,7 +103,7 @@ namespace OpenSim.Region.Examples.SimpleModule for (int i = 0; i < (objs*objs*objs); i++) { - LLVector3 posOffset = new LLVector3((i % objs) * 4, ((i % (objs*objs)) / ( objs )) * 4, (i / (objs*objs)) * 4); + LLVector3 posOffset = new LLVector3((i % objs) * 4, ((i % (objs*objs)) / (objs)) * 4, (i / (objs*objs)) * 4); ComplexObject complexObject = new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(), pos + posOffset); diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 102a1e6500..ddfb5a4566 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs @@ -729,7 +729,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin { prim.UpdateKinetics(); } - //if(this._simFlatPlanet!=null) this._simFlatPlanet.Restore(); + //if (this._simFlatPlanet!=null) this._simFlatPlanet.Restore(); } public override void GetResults() diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index d48a97eb51..5008927453 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -162,7 +162,7 @@ namespace OpenSim.Region.Physics.Meshing } // each simplex still in the list belongs to the hull of the region in question - // The new vertex (yes, we still deal with verices here :-) ) forms a triangle + // The new vertex (yes, we still deal with verices here :-)) forms a triangle // with each of these simplices. Build the new triangles and add them to the list foreach (Simplex s in simplices) { diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index cf9dc5d995..d1f1074b73 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -79,7 +79,7 @@ namespace OpenSim.Region.Physics.OdePlugin public bool m_returnCollisions = false; // Default we're a Geometry - private CollisionCategories m_collisionCategories = (CollisionCategories.Geom ); + private CollisionCategories m_collisionCategories = (CollisionCategories.Geom); // Default, Collide with Other Geometries, spaces and Bodies private CollisionCategories m_collisionFlags = m_default_collisionFlags; @@ -1170,9 +1170,8 @@ namespace OpenSim.Region.Physics.OdePlugin if (m_usePID) { - // If we're using the PID controller, then we have no gravity - fz = ((9.8f) * this.Mass ); + fz = 9.8f * this.Mass; // no lock; for now it's only called from within Simulate() diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 4050f3681d..61b577ecba 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -137,7 +137,7 @@ namespace OpenSim.Region.ScriptEngine.Common foreach (KeyValuePair inv in m_host.TaskInventory) { - if(inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) + if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) { invItemID=inv.Key; break; @@ -152,9 +152,9 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); foreach (KeyValuePair inv in m_host.TaskInventory) { - if(inv.Value.Name == name) + if (inv.Value.Name == name) { - if(inv.Value.Type != type) + if (inv.Value.Type != type) return LLUUID.Zero; return inv.Value.AssetID.ToString(); @@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); foreach (KeyValuePair inv in m_host.TaskInventory) { - if(inv.Value.Name == name) + if (inv.Value.Name == name) { return inv.Value.AssetID.ToString(); } @@ -362,11 +362,11 @@ namespace OpenSim.Region.ScriptEngine.Common double x,y,z,s; double c1 = Math.Cos(v.y / 2); - double s1 = Math.Sin(v.y / 2 ); - double c2 = Math.Cos(v.z / 2 ); - double s2 = Math.Sin(v.z / 2 ); - double c3 = Math.Cos(v.x / 2 ); - double s3 = Math.Sin(v.x / 2 ); + double s1 = Math.Sin(v.y / 2); + double c2 = Math.Cos(v.z / 2); + double s2 = Math.Sin(v.z / 2); + double c3 = Math.Cos(v.x / 2); + double s3 = Math.Sin(v.x / 2); double c1c2 = c1 * c2; double s1s2 = s1 * s2; @@ -2900,7 +2900,7 @@ namespace OpenSim.Region.ScriptEngine.Common { rotation rot = llEuler2Rot(<0,70,0> * DEG_TO_RAD); - llOwnerSay("to get here, we rotate over: "+ (string) llRot2Axis(rot) ); + llOwnerSay("to get here, we rotate over: "+ (string) llRot2Axis(rot)); llOwnerSay("and we rotate for: "+ (llRot2Angle(rot) * RAD_TO_DEG)); // convert back and forth between quaternion <-> vector and angle @@ -3339,14 +3339,13 @@ namespace OpenSim.Region.ScriptEngine.Common if (src.Data.Length > 0) { ret = src.Data[x++].ToString(); - for(;x @@ -3367,9 +3366,9 @@ namespace OpenSim.Region.ScriptEngine.Common m_host.AddScriptLPS(1); - for(int i=0; i 0) - for(int i=0;i=si[0]) result.Add(src.Data[i]); if (twopass && i>=si[1] && i<=ei[1]) result.Add(src.Data[i]); } + } else if (stride < 0) - for(int i=src.Length-1;i>=0;i+=stride) + { + for (int i = src.Length - 1; i >= 0; i += stride) { - if (i<=ei[0] && i>=si[0]) + if (i <= ei[0] && i >= si[0]) result.Add(src.Data[i]); - if (twopass && i>=si[1] && i<=ei[1]) + if (twopass && i >= si[1] && i <= ei[1]) result.Add(src.Data[i]); } + } } return result; - } public LSL_Types.Vector3 llGetRegionCorner() @@ -3635,12 +3639,12 @@ namespace OpenSim.Region.ScriptEngine.Common if (src.Length != 0 && test.Length != 0) { - for(int i=0; i< length; i++) + for (int i = 0; i < length; i++) { if (src.Data[i].Equals(test.Data[0])) { int j; - for(j=1;j beginning); j++) + for (j = seplen; (j < mlen) && (offset[best] > beginning); j++) { if (active[j]) { @@ -6174,7 +6180,7 @@ namespace OpenSim.Region.ScriptEngine.Common { foreach (object o in args.Data) { - switch(o.ToString()) + switch (o.ToString()) { case "1": ret.Add(av.Firstname + " " + av.Lastname); @@ -6207,9 +6213,9 @@ namespace OpenSim.Region.ScriptEngine.Common SceneObjectPart obj = World.GetSceneObjectPart(key); if (obj != null) { - foreach(object o in args.Data) + foreach (object o in args.Data) { - switch(o.ToString()) + switch (o.ToString()) { case "1": ret.Add(obj.Name); diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs index 369f6a762c..d824f0c3b5 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs @@ -370,21 +370,21 @@ namespace OpenSim.Region.ScriptEngine.Common LSL_Types.list llList2List(LSL_Types.list src, int start, int end); //wiki: llDeleteSubList(list src, integer start, integer end) LSL_Types.list llDeleteSubList(LSL_Types.list src, int start, int end); - //wiki: integer llGetListEntryType( list src, integer index ) + //wiki: integer llGetListEntryType(list src, integer index) LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index); - //wiki: string llList2CSV( list src ) + //wiki: string llList2CSV(list src) string llList2CSV(LSL_Types.list src); - //wiki: list llCSV2List( string src ) + //wiki: list llCSV2List(string src) LSL_Types.list llCSV2List(string src); - //wiki: list llListRandomize( list src, integer stride ) + //wiki: list llListRandomize(list src, integer stride) LSL_Types.list llListRandomize(LSL_Types.list src, int stride); - //wiki: list llList2ListStrided( list src, integer start, integer end, integer stride ) + //wiki: list llList2ListStrided(list src, integer start, integer end, integer stride) LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride); - //wiki: vector llGetRegionCorner( ) + //wiki: vector llGetRegionCorner() LSL_Types.Vector3 llGetRegionCorner(); - //wiki: list llListInsertList( list dest, list src, integer start ) + //wiki: list llListInsertList(list dest, list src, integer start) LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int start); - //wiki: integer llListFindList( list src, list test ) + //wiki: integer llListFindList(list src, list test) LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test); //wiki: string llGetObjectName() string llGetObjectName(); @@ -479,7 +479,7 @@ namespace OpenSim.Region.ScriptEngine.Common string llDumpList2String(LSL_Types.list src, string seperator); //wiki: integer llScriptDanger(vector pos) LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos); - //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) + //wiki: llDialog(key avatar, string message, list buttons, integer chat_channel) void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel); //wiki: llVolumeDetect(integer detect) void llVolumeDetect(int detect); @@ -503,9 +503,9 @@ namespace OpenSim.Region.ScriptEngine.Common void llCloseRemoteDataChannel(string channel); //wiki: string llMD5String(string src, integer nonce) string llMD5String(string src, int nonce); - //wiki: llSetPrimitiveParams( list rules ) + //wiki: llSetPrimitiveParams(list rules) void llSetPrimitiveParams(LSL_Types.list rules); - //wiki: llSetLinkPrimitiveParams(integer linknumber, list rules ) + //wiki: llSetLinkPrimitiveParams(integer linknumber, list rules) void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules); //wiki: string llStringToBase64(string str) string llStringToBase64(string str); @@ -519,7 +519,7 @@ namespace OpenSim.Region.ScriptEngine.Common double llLog10(double val); //wiki: double llLog(double val) double llLog(double val); - //wiki: list llGetAnimationList( key id ) + //wiki: list llGetAnimationList(key id) LSL_Types.list llGetAnimationList(string id); //wiki: llSetParcelMusicURL(string url) void llSetParcelMusicURL(string url); @@ -541,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.Common LSL_Types.LSLInteger llGetNumberOfPrims(); //wiki: key llGetNumberOfNotecardLines(string name) string llGetNumberOfNotecardLines(string name); - //wiki: list llGetBoundingBox( key object ) + //wiki: list llGetBoundingBox(key object) LSL_Types.list llGetBoundingBox(string obj); //wiki: vector llGetGeometricCenter() LSL_Types.Vector3 llGetGeometricCenter(); @@ -557,7 +557,7 @@ namespace OpenSim.Region.ScriptEngine.Common string llGetSimulatorHostname(); //llSetLocalRot(rotation rot) void llSetLocalRot(LSL_Types.Quaternion rot); - //wiki: list llParseStringKeepNulls( string src, list separators, list spacers ) + //wiki: list llParseStringKeepNulls(string src, list separators, list spacers) LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list seperators, LSL_Types.list spacers); //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param) void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, @@ -584,14 +584,14 @@ namespace OpenSim.Region.ScriptEngine.Common LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end); //wiki: llLoadURL(key avatar_id, string message, string url) void llLoadURL(string avatar_id, string message, string url); - //wiki: llParcelMediaCommandList( list commandList ) + //wiki: llParcelMediaCommandList(list commandList) void llParcelMediaCommandList(LSL_Types.list commandList); void llParcelMediaQuery(); //wiki integer llModPow(integer a, integer b, integer c) LSL_Types.LSLInteger llModPow(int a, int b, int c); //wiki: integer llGetInventoryType(string name) LSL_Types.LSLInteger llGetInventoryType(string name); - //wiki: llSetPayPrice( integer price, list quick_pay_buttons ) + //wiki: llSetPayPrice(integer price, list quick_pay_buttons) void llSetPayPrice(int price, LSL_Types.list quick_pay_buttons); //wiki: vector llGetCameraPos() LSL_Types.Vector3 llGetCameraPos(); @@ -613,11 +613,11 @@ namespace OpenSim.Region.ScriptEngine.Common void llRemoveFromLandPassList(string avatar); //wiki: llRemoveFromLandBanList(key avatar) void llRemoveFromLandBanList(string avatar); - //wiki: llSetCameraParams( list rules ) + //wiki: llSetCameraParams(list rules) void llSetCameraParams(LSL_Types.list rules); //wiki: llClearCameraParams() void llClearCameraParams(); - //wiki: double llListStatistics( integer operation, list src ) + //wiki: double llListStatistics(integer operation, list src) double llListStatistics(int operation, LSL_Types.list src); //wiki: integer llGetUnixTime() LSL_Types.LSLInteger llGetUnixTime(); @@ -634,15 +634,15 @@ namespace OpenSim.Region.ScriptEngine.Common void llResetLandPassList(); //wiki: integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) LSL_Types.LSLInteger llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); - //wiki: list llGetParcelPrimOwners( vector pos ) + //wiki: list llGetParcelPrimOwners(vector pos) LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos); //wiki: integer llGetObjectPrimCount(key object_id) LSL_Types.LSLInteger llGetObjectPrimCount(string object_id); - //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide ) + //wiki: integer llGetParcelMaxPrims(vector pos, integer sim_wide) LSL_Types.LSLInteger llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); //wiki: llGetParcelDetails(vector pos, list params) LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param); - //wiki: llSetLinkTexture(integer linknumber, string texture, integer face ) + //wiki: llSetLinkTexture(integer linknumber, string texture, integer face) void llSetLinkTexture(int linknumber, string texture, int face); //wiki: string llStringTrim(string src, int type) string llStringTrim(string src, int type); diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 14ee319eed..c3a36ddfa9 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -506,7 +506,7 @@ namespace OpenSim.Region.ScriptEngine.Common int src; int dest=0; - for(src = 0 ; src < m_data.Length ; src++) + for (src = 0; src < m_data.Length; src++) { if (src < start || src > end) ret[dest++]=m_data[src]; @@ -624,9 +624,9 @@ namespace OpenSim.Region.ScriptEngine.Common Array.Copy(Data, 0, ret, 0, Data.Length); keys=new string[Data.Length]; - int k; - for(k=0;k(); LLUUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, - extraParams, timer, true, (byte) alpha ); + extraParams, timer, true, (byte) alpha); return createdTexture.ToString(); } else diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index 1210b77325..4311836b77 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs @@ -235,7 +235,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin // dot=dot(forward_dir,obj_dir) // mag_fwd = mag(forward_dir) // mag_obj = mag(obj_dir) - // ang = acos( dot /(mag_fwd*mag_obj)) + // ang = acos(dot /(mag_fwd*mag_obj)) double ang_obj = 0; try { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 214f7c9567..f2afe0fda5 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs @@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // TODO: HOOK ALL EVENTS UP TO SERVER! IMoneyModule money=myScriptEngine.World.RequestModuleInterface(); - if(money != null) + if (money != null) { money.OnObjectPaid+=HandleObjectPaid; } @@ -91,7 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, int amount) { SceneObjectPart part=myScriptEngine.World.GetSceneObjectPart(objectID); - if(part != null) + if (part != null) { money(part.LocalId, agentID, amount); } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 3dbd88c6e4..997f46f858 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs @@ -297,10 +297,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Send inner exception string[] lines=e.InnerException.ToString().Replace("\r", "").Split('\n'); int line=0; - foreach(string t in lines) + foreach (string t in lines) { int idx=t.IndexOf("SecondLife.Script."); - if(idx != -1) + if (idx != -1) { int colon=t.IndexOf(":"); line=Convert.ToInt32(t.Substring(colon+1)); diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 3320ddb97c..715e465ba3 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs @@ -182,7 +182,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase if (DateTime.Now.Ticks - Last_ReReadConfigFilens > m_ScriptEngine.RefreshConfigFilens) { - //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens ); + //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens); // Its time to re-read config file m_ScriptEngine.ReadConfig(); Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time diff --git a/OpenSim/Tests/Common/DoubleToleranceConstraint.cs b/OpenSim/Tests/Common/DoubleToleranceConstraint.cs index 3363c54b6c..a766549d84 100644 --- a/OpenSim/Tests/Common/DoubleToleranceConstraint.cs +++ b/OpenSim/Tests/Common/DoubleToleranceConstraint.cs @@ -53,14 +53,14 @@ namespace OpenSim.Tests.Common { throw new ArgumentException("Constraint cannot be used upon null values."); } - if( valueToBeTested.GetType() != typeof(double)) + if (valueToBeTested.GetType() != typeof(double)) { throw new ArgumentException("Constraint cannot be used upon non double-values."); } _valueToBeTested = (double)valueToBeTested; - return IsWithinDoubleConstraint(_valueToBeTested, _baseValue ); + return IsWithinDoubleConstraint(_valueToBeTested, _baseValue); } public override void WriteDescriptionTo(MessageWriter writer) diff --git a/OpenSim/Tests/Common/VectorToleranceConstraint.cs b/OpenSim/Tests/Common/VectorToleranceConstraint.cs index cc96615799..2b60db31ac 100644 --- a/OpenSim/Tests/Common/VectorToleranceConstraint.cs +++ b/OpenSim/Tests/Common/VectorToleranceConstraint.cs @@ -61,14 +61,9 @@ namespace OpenSim.Tests.Common _valueToBeTested = (LLVector3) valueToBeTested; - if ( IsWithinDoubleConstraint(_valueToBeTested.X,_baseValue.X) && - IsWithinDoubleConstraint(_valueToBeTested.Y,_baseValue.Y) && - IsWithinDoubleConstraint(_valueToBeTested.Z,_baseValue.Z) ) - { - return true; - } - - return false; + return (IsWithinDoubleConstraint(_valueToBeTested.X, _baseValue.X) && + IsWithinDoubleConstraint(_valueToBeTested.Y, _baseValue.Y) && + IsWithinDoubleConstraint(_valueToBeTested.Z, _baseValue.Z)); } public override void WriteDescriptionTo(MessageWriter writer) diff --git a/OpenSim/Tests/Inventory/TestInventory.cs b/OpenSim/Tests/Inventory/TestInventory.cs index c1351d9426..3083c894ad 100644 --- a/OpenSim/Tests/Inventory/TestInventory.cs +++ b/OpenSim/Tests/Inventory/TestInventory.cs @@ -147,13 +147,12 @@ namespace OpenSim.Test.Inventory Assert.IsNotNull(folders, "Failed to get rootfolders for user"); bool foundRoot = false; - foreach(InventoryFolderBase f in folders) { - + foreach (InventoryFolderBase f in folders) + { // a root folder has a zero valued LLUUID Assert.AreEqual(f.parentID, LLUUID.Zero, "non root folder returned"); - - if(f.agentID == root.agentID) + if (f.agentID == root.agentID) { // we cannot have two different user specific root folders Assert.IsFalse(foundRoot, "Two different user specific root folders returned"); diff --git a/OpenSim/Tools/OpenSim.GUI/Main.cs b/OpenSim/Tools/OpenSim.GUI/Main.cs index adb331b156..9467312f73 100644 --- a/OpenSim/Tools/OpenSim.GUI/Main.cs +++ b/OpenSim/Tools/OpenSim.GUI/Main.cs @@ -407,7 +407,7 @@ namespace OpenSim.GUI portBox1.Text = "13050"; MessageBox.Show("Enter Usable port number, defaulting to 13050."); } - if(aPort < 13000) + if (aPort < 13000) { portBox1.Text = "13000"; MessageBox.Show("Enter Usable port number, defaulting to 13000."); diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 3ef0ef75b8..27327517e8 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs @@ -147,7 +147,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer foreach (ScenePresence pre in presences) { IClientAPI client = pre.ControllingClient; - //if(pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) { + //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) { if (client.IsActive) { get_scene_presence_filter++; @@ -160,7 +160,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer foreach (ScenePresence pre in avatars) { IClientAPI client = pre.ControllingClient; - //if(pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) { + //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) { if (client.IsActive) { get_avatar_filter++; @@ -884,7 +884,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer // Because data changes by the physics simulation when the client doesn't move, // if MovementFlag is false, It is necessary to synchronize. - //if(pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) + //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) if (client.IsActive) { //m_log.Info("[SPLITSCENE] "+String.Format("Client moving in {0} {1}", scene.RegionInfo.RegionID, pre.AbsolutePosition)); diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs index 9722a1bb1a..eb57b2d433 100644 --- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs +++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs @@ -150,7 +150,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer state.ms_ptr.Read(packet, 0, state.header.numbytes); /* - for(int i=0; i