diff options
Diffstat (limited to '')
11 files changed, 43 insertions, 44 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql b/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql index 1776cac..1434330 100644 --- a/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql +++ b/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql | |||
@@ -1,6 +1,6 @@ | |||
1 | BEGIN TRANSACTION | 1 | BEGIN TRANSACTION |
2 | 2 | ||
3 | ALTER TABLE assets add create_time integer default 0 | 3 | ALTER TABLE assets add create_time integer default 0 |
4 | ALTER TABLE assets add access_time integer default 0 | 4 | ALTER TABLE assets add access_time integer default 0 |
5 | 5 | ||
6 | COMMIT | 6 | COMMIT |
diff --git a/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql index 2eed71d..74ad9c2 100644 --- a/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql +++ b/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql | |||
@@ -1,7 +1,7 @@ | |||
1 | BEGIN TRANSACTION | 1 | BEGIN TRANSACTION |
2 | 2 | ||
3 | ALTER TABLE regionsettings ADD sunvectorx float NOT NULL default 0; | 3 | ALTER TABLE regionsettings ADD sunvectorx float NOT NULL default 0; |
4 | ALTER TABLE regionsettings ADD sunvectory float NOT NULL default 0; | 4 | ALTER TABLE regionsettings ADD sunvectory float NOT NULL default 0; |
5 | ALTER TABLE regionsettings ADD sunvectorz float NOT NULL default 0; | 5 | ALTER TABLE regionsettings ADD sunvectorz float NOT NULL default 0; |
6 | 6 | ||
7 | COMMIT | 7 | COMMIT |
diff --git a/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql index 2218216..14c71a3 100644 --- a/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql +++ b/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql | |||
@@ -1,6 +1,6 @@ | |||
1 | BEGIN TRANSACTION | 1 | BEGIN TRANSACTION |
2 | 2 | ||
3 | ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000' | 3 | ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000' |
4 | ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0 | 4 | ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0 |
5 | 5 | ||
6 | COMMIT | 6 | COMMIT |
diff --git a/OpenSim/Data/MySQL/Resources/022_RegionStore.sql b/OpenSim/Data/MySQL/Resources/022_RegionStore.sql index af4fdce..df0bb7d 100644 --- a/OpenSim/Data/MySQL/Resources/022_RegionStore.sql +++ b/OpenSim/Data/MySQL/Resources/022_RegionStore.sql | |||
@@ -1,6 +1,6 @@ | |||
1 | BEGIN; | 1 | BEGIN; |
2 | 2 | ||
3 | ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'; | 3 | ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'; |
4 | ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0; | 4 | ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0; |
5 | 5 | ||
6 | COMMIT; | 6 | COMMIT; |
diff --git a/OpenSim/Data/SQLite/Resources/015_RegionStore.sql b/OpenSim/Data/SQLite/Resources/015_RegionStore.sql index f9c0eea..c43f356 100644 --- a/OpenSim/Data/SQLite/Resources/015_RegionStore.sql +++ b/OpenSim/Data/SQLite/Resources/015_RegionStore.sql | |||
@@ -1,6 +1,6 @@ | |||
1 | BEGIN; | 1 | BEGIN; |
2 | 2 | ||
3 | ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000'; | 3 | ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000'; |
4 | ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0; | 4 | ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0; |
5 | 5 | ||
6 | COMMIT; | 6 | COMMIT; |
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 1f04865..66916b6 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
@@ -590,7 +590,7 @@ namespace OpenSim.Grid.MessagingServer | |||
590 | // Process Response | 590 | // Process Response |
591 | Hashtable UserRespData = (Hashtable)UserResp.Value; | 591 | Hashtable UserRespData = (Hashtable)UserResp.Value; |
592 | // if we got a response, we were successful | 592 | // if we got a response, we were successful |
593 | if(!UserRespData.ContainsKey("responsestring")) | 593 | if (!UserRespData.ContainsKey("responsestring")) |
594 | success = false; | 594 | success = false; |
595 | } | 595 | } |
596 | catch | 596 | catch |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b11a5e8..978a2da 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -5715,8 +5715,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5715 | 5715 | ||
5716 | List<UUID> returnIDs = new List<UUID>(); | 5716 | List<UUID> returnIDs = new List<UUID>(); |
5717 | 5717 | ||
5718 | foreach(ParcelSelectObjectsPacket.ReturnIDsBlock rb in | 5718 | foreach (ParcelSelectObjectsPacket.ReturnIDsBlock rb in |
5719 | selectPacket.ReturnIDs) | 5719 | selectPacket.ReturnIDs) |
5720 | { | 5720 | { |
5721 | returnIDs.Add(rb.ReturnID); | 5721 | returnIDs.Add(rb.ReturnID); |
5722 | } | 5722 | } |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index daff760..4cdff70 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | |||
@@ -516,7 +516,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
516 | // if it's a local friend, we don't have to do the lookup | 516 | // if it's a local friend, we don't have to do the lookup |
517 | ScenePresence friendPresence = GetAnyPresenceFromAgentID(friendID); | 517 | ScenePresence friendPresence = GetAnyPresenceFromAgentID(friendID); |
518 | 518 | ||
519 | if(friendPresence != null) | 519 | if (friendPresence != null) |
520 | { | 520 | { |
521 | m_log.Debug("[FRIEND]: Local agent detected."); | 521 | m_log.Debug("[FRIEND]: Local agent detected."); |
522 | 522 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 741c47e..221af44 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -966,7 +966,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
966 | /// <returns></returns> | 966 | /// <returns></returns> |
967 | public void Backup() | 967 | public void Backup() |
968 | { | 968 | { |
969 | lock(m_returns) | 969 | lock (m_returns) |
970 | { | 970 | { |
971 | EventManager.TriggerOnBackup(m_storageManager.DataStore); | 971 | EventManager.TriggerOnBackup(m_storageManager.DataStore); |
972 | m_backingup = false; | 972 | m_backingup = false; |
@@ -1003,7 +1003,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1003 | 1003 | ||
1004 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) | 1004 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) |
1005 | { | 1005 | { |
1006 | lock(m_returns) | 1006 | lock (m_returns) |
1007 | { | 1007 | { |
1008 | if (m_returns.ContainsKey(agentID)) | 1008 | if (m_returns.ContainsKey(agentID)) |
1009 | { | 1009 | { |
@@ -2428,7 +2428,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2428 | if (regionInfo == null) | 2428 | if (regionInfo == null) |
2429 | { | 2429 | { |
2430 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); | 2430 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); |
2431 | if(regionInfo != null) // home region can be away temporarily, too | 2431 | if (regionInfo != null) // home region can be away temporarily, too |
2432 | { | 2432 | { |
2433 | UserProfile.HomeRegionID = regionInfo.RegionID; | 2433 | UserProfile.HomeRegionID = regionInfo.RegionID; |
2434 | CommsManager.UserService.UpdateUserProfile(UserProfile); | 2434 | CommsManager.UserService.UpdateUserProfile(UserProfile); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index e8eaef8..f9eaa89 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -593,9 +593,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
593 | RegionHandle = m_scene.RegionInfo.RegionHandle; | 593 | RegionHandle = m_scene.RegionInfo.RegionHandle; |
594 | 594 | ||
595 | m_rootPart.ParentID = 0; | 595 | m_rootPart.ParentID = 0; |
596 | if (m_rootPart.LocalId==0) | 596 | if (m_rootPart.LocalId==0) |
597 | m_rootPart.LocalId = m_scene.AllocateLocalId(); | 597 | m_rootPart.LocalId = m_scene.AllocateLocalId(); |
598 | |||
599 | 598 | ||
600 | // No need to lock here since the object isn't yet in a scene | 599 | // No need to lock here since the object isn't yet in a scene |
601 | foreach (SceneObjectPart part in m_parts.Values) | 600 | foreach (SceneObjectPart part in m_parts.Values) |
@@ -603,7 +602,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
603 | if (Object.ReferenceEquals(part, m_rootPart)) | 602 | if (Object.ReferenceEquals(part, m_rootPart)) |
604 | continue; | 603 | continue; |
605 | if (part.LocalId==0) | 604 | if (part.LocalId==0) |
606 | part.LocalId = m_scene.AllocateLocalId(); | 605 | part.LocalId = m_scene.AllocateLocalId(); |
607 | part.ParentID = m_rootPart.LocalId; | 606 | part.ParentID = m_rootPart.LocalId; |
608 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); | 607 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); |
609 | } | 608 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 2c501e4..888643e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1244,7 +1244,7 @@ if (m_shape != null) { | |||
1244 | if (userExposed) | 1244 | if (userExposed) |
1245 | dupe.ResetIDs(linkNum); | 1245 | dupe.ResetIDs(linkNum); |
1246 | 1246 | ||
1247 | // Move afterwards ResetIDs as it clears the localID | 1247 | // Move afterwards ResetIDs as it clears the localID |
1248 | dupe.LocalId = localID; | 1248 | dupe.LocalId = localID; |
1249 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. | 1249 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. |
1250 | dupe._lastOwnerID = ObjectOwner; | 1250 | dupe._lastOwnerID = ObjectOwner; |
@@ -1928,7 +1928,7 @@ if (m_shape != null) { | |||
1928 | { | 1928 | { |
1929 | UUID = UUID.Random(); | 1929 | UUID = UUID.Random(); |
1930 | LinkNum = linkNum; | 1930 | LinkNum = linkNum; |
1931 | LocalId = 0; | 1931 | LocalId = 0; |
1932 | 1932 | ||
1933 | ResetInventoryIDs(); | 1933 | ResetInventoryIDs(); |
1934 | } | 1934 | } |