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

Update svn properties, minor formatting cleanup.

0.6.1-post-fixes
Jeff Ames 2008-11-21 18:44:48 +00:00
parent 7dce464113
commit ecac5c9c5a
11 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/MSSQL/Resources/003_AssetStore.sql
View File

@ -1,6 +1,6 @@
BEGIN TRANSACTION
ALTER TABLE assets add create_time integer default 0
ALTER TABLE assets add access_time integer default 0
COMMIT
BEGIN TRANSACTION
ALTER TABLE assets add create_time integer default 0
ALTER TABLE assets add access_time integer default 0
COMMIT

14
OpenSim/Data/MSSQL/Resources/010_RegionStore.sql
View File

@ -1,7 +1,7 @@
BEGIN TRANSACTION
ALTER TABLE regionsettings ADD sunvectorx float NOT NULL default 0;
ALTER TABLE regionsettings ADD sunvectory float NOT NULL default 0;
ALTER TABLE regionsettings ADD sunvectorz float NOT NULL default 0;
COMMIT
BEGIN TRANSACTION
ALTER TABLE regionsettings ADD sunvectorx float NOT NULL default 0;
ALTER TABLE regionsettings ADD sunvectory float NOT NULL default 0;
ALTER TABLE regionsettings ADD sunvectorz float NOT NULL default 0;
COMMIT

12
OpenSim/Data/MSSQL/Resources/011_RegionStore.sql
View File

@ -1,6 +1,6 @@
BEGIN TRANSACTION
ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'
ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0
COMMIT
BEGIN TRANSACTION
ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'
ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0
COMMIT

12
OpenSim/Data/MySQL/Resources/022_RegionStore.sql
View File

@ -1,6 +1,6 @@
BEGIN;
ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000';
ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0;
COMMIT;
BEGIN;
ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000';
ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0;
COMMIT;

12
OpenSim/Data/SQLite/Resources/015_RegionStore.sql
View File

@ -1,6 +1,6 @@
BEGIN;
ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0;
COMMIT;
BEGIN;
ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0;
COMMIT;

2
OpenSim/Grid/MessagingServer/MessageService.cs
View File

@ -590,7 +590,7 @@ namespace OpenSim.Grid.MessagingServer
// Process Response
Hashtable UserRespData = (Hashtable)UserResp.Value;
// if we got a response, we were successful
if(!UserRespData.ContainsKey("responsestring"))
if (!UserRespData.ContainsKey("responsestring"))
success = false;
}
catch

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

@ -5715,8 +5715,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
List<UUID> returnIDs = new List<UUID>();
foreach(ParcelSelectObjectsPacket.ReturnIDsBlock rb in
selectPacket.ReturnIDs)
foreach (ParcelSelectObjectsPacket.ReturnIDsBlock rb in
selectPacket.ReturnIDs)
{
returnIDs.Add(rb.ReturnID);
}

2
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -516,7 +516,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
// if it's a local friend, we don't have to do the lookup
ScenePresence friendPresence = GetAnyPresenceFromAgentID(friendID);
if(friendPresence != null)
if (friendPresence != null)
{
m_log.Debug("[FRIEND]: Local agent detected.");

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -966,7 +966,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns>
public void Backup()
{
lock(m_returns)
lock (m_returns)
{
EventManager.TriggerOnBackup(m_storageManager.DataStore);
m_backingup = false;
@ -1003,7 +1003,7 @@ namespace OpenSim.Region.Environment.Scenes
public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason)
{
lock(m_returns)
lock (m_returns)
{
if (m_returns.ContainsKey(agentID))
{
@ -2428,7 +2428,7 @@ namespace OpenSim.Region.Environment.Scenes
if (regionInfo == null)
{
regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
if(regionInfo != null) // home region can be away temporarily, too
if (regionInfo != null) // home region can be away temporarily, too
{
UserProfile.HomeRegionID = regionInfo.RegionID;
CommsManager.UserService.UpdateUserProfile(UserProfile);

7
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -593,9 +593,8 @@ namespace OpenSim.Region.Environment.Scenes
RegionHandle = m_scene.RegionInfo.RegionHandle;
m_rootPart.ParentID = 0;
if (m_rootPart.LocalId==0)
m_rootPart.LocalId = m_scene.AllocateLocalId();
if (m_rootPart.LocalId==0)
m_rootPart.LocalId = m_scene.AllocateLocalId();
// No need to lock here since the object isn't yet in a scene
foreach (SceneObjectPart part in m_parts.Values)
@ -603,7 +602,7 @@ namespace OpenSim.Region.Environment.Scenes
if (Object.ReferenceEquals(part, m_rootPart))
continue;
if (part.LocalId==0)
part.LocalId = m_scene.AllocateLocalId();
part.LocalId = m_scene.AllocateLocalId();
part.ParentID = m_rootPart.LocalId;
//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);
}

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

@ -1244,7 +1244,7 @@ if (m_shape != null) {
if (userExposed)
dupe.ResetIDs(linkNum);
// Move afterwards ResetIDs as it clears the localID
// Move afterwards ResetIDs as it clears the localID
dupe.LocalId = localID;
// This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
dupe._lastOwnerID = ObjectOwner;
@ -1928,7 +1928,7 @@ if (m_shape != null) {
{
UUID = UUID.Random();
LinkNum = linkNum;
LocalId = 0;
LocalId = 0;
ResetInventoryIDs();
}