Merge branch 'master' into presence-refactor
commit
7f960cd595
|
@ -322,8 +322,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
|
|||
if (Uri.TryCreate(file, UriKind.RelativeOrAbsolute, out result))
|
||||
{
|
||||
// the url is valid
|
||||
string fileType = file.Substring(file.LastIndexOf('/') + 1);
|
||||
terrainModule.LoadFromStream(fileType, result);
|
||||
string fileType = file.Substring(file.LastIndexOf('/') + 1);
|
||||
terrainModule.LoadFromStream(fileType, result);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -757,24 +757,24 @@ namespace OpenSim.Client.MXP.ClientStack
|
|||
public event MuteListRequest OnMuteListRequest;
|
||||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
|
|
|
@ -1,4 +1,31 @@
|
|||
using System;
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
|
@ -375,24 +402,24 @@ namespace OpenSim.Client.Sirikata.ClientStack
|
|||
public event MuteListRequest OnMuteListRequest;
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public void SetDebugPacketLevel(int newDebug)
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.Protocol {
|
||||
|
|
|
@ -1,4 +1,31 @@
|
|||
using System;
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
namespace PBJ
|
||||
{
|
||||
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.Persistence.Protocol {
|
||||
|
@ -812,7 +839,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Reads(int index) {
|
||||
return new StorageElement(super.GetReads(index));
|
||||
}
|
||||
public Builder AddReads(StorageElement value ) {
|
||||
public Builder AddReads(StorageElement value) {
|
||||
super.AddReads(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -919,7 +946,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Reads(int index) {
|
||||
return new StorageElement(super.GetReads(index));
|
||||
}
|
||||
public Builder AddReads(StorageElement value ) {
|
||||
public Builder AddReads(StorageElement value) {
|
||||
super.AddReads(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1026,7 +1053,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Writes(int index) {
|
||||
return new StorageElement(super.GetWrites(index));
|
||||
}
|
||||
public Builder AddWrites(StorageElement value ) {
|
||||
public Builder AddWrites(StorageElement value) {
|
||||
super.AddWrites(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1155,7 +1182,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Reads(int index) {
|
||||
return new StorageElement(super.GetReads(index));
|
||||
}
|
||||
public Builder AddReads(StorageElement value ) {
|
||||
public Builder AddReads(StorageElement value) {
|
||||
super.AddReads(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1170,7 +1197,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Writes(int index) {
|
||||
return new StorageElement(super.GetWrites(index));
|
||||
}
|
||||
public Builder AddWrites(StorageElement value ) {
|
||||
public Builder AddWrites(StorageElement value) {
|
||||
super.AddWrites(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1322,7 +1349,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Reads(int index) {
|
||||
return new StorageElement(super.GetReads(index));
|
||||
}
|
||||
public Builder AddReads(StorageElement value ) {
|
||||
public Builder AddReads(StorageElement value) {
|
||||
super.AddReads(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1337,7 +1364,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Writes(int index) {
|
||||
return new StorageElement(super.GetWrites(index));
|
||||
}
|
||||
public Builder AddWrites(StorageElement value ) {
|
||||
public Builder AddWrites(StorageElement value) {
|
||||
super.AddWrites(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1352,7 +1379,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public CompareElement Compares(int index) {
|
||||
return new CompareElement(super.GetCompares(index));
|
||||
}
|
||||
public Builder AddCompares(CompareElement value ) {
|
||||
public Builder AddCompares(CompareElement value) {
|
||||
super.AddCompares(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1493,7 +1520,7 @@ namespace Sirikata.Persistence.Protocol {
|
|||
public StorageElement Reads(int index) {
|
||||
return new StorageElement(super.GetReads(index));
|
||||
}
|
||||
public Builder AddReads(StorageElement value ) {
|
||||
public Builder AddReads(StorageElement value) {
|
||||
super.AddReads(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.Physics.Protocol {
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.Protocol {
|
||||
|
@ -3809,7 +3836,7 @@ namespace Sirikata.Protocol {
|
|||
public ConnectToSpace SpaceProperties(int index) {
|
||||
return new ConnectToSpace(super.GetSpaceProperties(index));
|
||||
}
|
||||
public Builder AddSpaceProperties(ConnectToSpace value ) {
|
||||
public Builder AddSpaceProperties(ConnectToSpace value) {
|
||||
super.AddSpaceProperties(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.Subscription.Protocol {
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.PB {
|
||||
|
@ -407,7 +434,7 @@ namespace Sirikata.PB {
|
|||
public Types.SubMessage Submessers(int index) {
|
||||
return new Types.SubMessage(super.GetSubmessers(index));
|
||||
}
|
||||
public Builder AddSubmessers(Types.SubMessage value ) {
|
||||
public Builder AddSubmessers(Types.SubMessage value) {
|
||||
super.AddSubmessers(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1651,7 +1678,7 @@ namespace Sirikata.PB {
|
|||
public Types.SubMessage Submessers(int index) {
|
||||
return new Types.SubMessage(super.GetSubmessers(index));
|
||||
}
|
||||
public Builder AddSubmessers(Types.SubMessage value ) {
|
||||
public Builder AddSubmessers(Types.SubMessage value) {
|
||||
super.AddSubmessers(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
@ -1709,7 +1736,7 @@ namespace Sirikata.PB {
|
|||
public ExternalMessage Extmessers(int index) {
|
||||
return new ExternalMessage(super.GetExtmessers(index));
|
||||
}
|
||||
public Builder AddExtmessers(ExternalMessage value ) {
|
||||
public Builder AddExtmessers(ExternalMessage value) {
|
||||
super.AddExtmessers(value._PBJSuper);
|
||||
return this;
|
||||
}
|
||||
|
|
|
@ -1,3 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using pbd = global::Google.ProtocolBuffers.Descriptors;
|
||||
using pb = global::Google.ProtocolBuffers;
|
||||
namespace Sirikata.Network.Protocol {
|
||||
|
|
|
@ -93,7 +93,7 @@ namespace OpenSim.Client.Sirikata
|
|||
|
||||
public void PostInitialise()
|
||||
{
|
||||
if(!m_enabled)
|
||||
if (!m_enabled)
|
||||
return;
|
||||
|
||||
m_listener = new TcpListener(IPAddress.Any, 5943);
|
||||
|
@ -102,7 +102,7 @@ namespace OpenSim.Client.Sirikata
|
|||
|
||||
private void ListenLoop()
|
||||
{
|
||||
while(m_running)
|
||||
while (m_running)
|
||||
{
|
||||
m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener);
|
||||
}
|
||||
|
|
|
@ -406,24 +406,24 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
|
|||
public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { };
|
||||
public event PlacesQuery OnPlacesQuery = delegate { };
|
||||
public event FindAgentUpdate OnFindAgentEvent = delegate { };
|
||||
public event TrackAgentUpdate OnTrackAgentEvent = delegate { };
|
||||
public event NewUserReport OnUserReportEvent = delegate { };
|
||||
public event SaveStateHandler OnSaveStateEvent = delegate { };
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest = delegate { };
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest = delegate { };
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest = delegate { };
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent = delegate { };
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent = delegate { };
|
||||
public event ParcelBuyPass OnParcelBuyPass = delegate { };
|
||||
public event ParcelGodMark OnParcelGodMark = delegate { };
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest = delegate { };
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest = delegate { };
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes = delegate { };
|
||||
public event SendPostcard OnSendPostcard = delegate { };
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent = delegate { };
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent = delegate { };
|
||||
public event GodlikeMessage onGodlikeMessageEvent = delegate { };
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent = delegate { };
|
||||
public event TrackAgentUpdate OnTrackAgentEvent = delegate { };
|
||||
public event NewUserReport OnUserReportEvent = delegate { };
|
||||
public event SaveStateHandler OnSaveStateEvent = delegate { };
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest = delegate { };
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest = delegate { };
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest = delegate { };
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent = delegate { };
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent = delegate { };
|
||||
public event ParcelBuyPass OnParcelBuyPass = delegate { };
|
||||
public event ParcelGodMark OnParcelGodMark = delegate { };
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest = delegate { };
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest = delegate { };
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes = delegate { };
|
||||
public event SendPostcard OnSendPostcard = delegate { };
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent = delegate { };
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent = delegate { };
|
||||
public event GodlikeMessage onGodlikeMessageEvent = delegate { };
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent = delegate { };
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,84 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Data
|
||||
{
|
||||
public class XInventoryFolder
|
||||
{
|
||||
public string folderName;
|
||||
public int type;
|
||||
public int version;
|
||||
public UUID folderID;
|
||||
public UUID agentID;
|
||||
public UUID parentFolderID;
|
||||
}
|
||||
|
||||
public class XInventoryItem
|
||||
{
|
||||
public UUID assetID;
|
||||
public int assetType;
|
||||
public string inventoryName;
|
||||
public string inventoryDescription;
|
||||
public int inventoryNextPermissions;
|
||||
public int inventoryCurrentPermissions;
|
||||
public int invType;
|
||||
public UUID creatorID;
|
||||
public int inventoryBasePermissions;
|
||||
public int inventoryEveryOnePermissions;
|
||||
public int salePrice;
|
||||
public int saleType;
|
||||
public int creationDate;
|
||||
public UUID groupID;
|
||||
public bool groupOwned;
|
||||
public int flags;
|
||||
public UUID inventoryID;
|
||||
public UUID avatarID;
|
||||
public UUID parentFolderID;
|
||||
public int inventoryGroupPermissions;
|
||||
}
|
||||
|
||||
public interface IXInventoryData
|
||||
{
|
||||
XInventoryFolder[] GetFolders(string[] fields, string[] vals);
|
||||
XInventoryItem[] GetItems(string[] fields, string[] vals);
|
||||
|
||||
bool StoreFolder(XInventoryFolder folder);
|
||||
bool StoreItem(XInventoryItem item);
|
||||
|
||||
bool DeleteFolders(string field, string val);
|
||||
bool DeleteItems(string field, string val);
|
||||
|
||||
bool MoveItem(string id, string newParent);
|
||||
XInventoryItem[] GetActiveGestures(UUID principalID);
|
||||
int GetAssetPermissions(UUID principalID, UUID assetID);
|
||||
}
|
||||
}
|
|
@ -153,6 +153,11 @@ namespace OpenSim.Data.MySQL
|
|||
UUID.TryParse(reader[name].ToString(), out uuid);
|
||||
m_Fields[name].SetValue(row, uuid);
|
||||
}
|
||||
else if (m_Fields[name].GetValue(row) is int)
|
||||
{
|
||||
int v = Convert.ToInt32(reader[name]);
|
||||
m_Fields[name].SetValue(row, v);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Fields[name].SetValue(row, reader[name]);
|
||||
|
|
|
@ -91,7 +91,7 @@ namespace OpenSim.Data.MySQL
|
|||
rollbackStore = GridDataMySqlFile.ParseFileReadValue("rollback") == "true";
|
||||
opengridmode = GridDataMySqlFile.ParseFileReadValue("opengridmode") == "true";
|
||||
|
||||
if(rollbackStore)
|
||||
if (rollbackStore)
|
||||
m_log.Warn("[MysqlInventory] Enabling rollback mode in: " + rollbackDir);
|
||||
|
||||
database =
|
||||
|
@ -264,7 +264,7 @@ namespace OpenSim.Data.MySQL
|
|||
{
|
||||
database.Reconnect();
|
||||
m_log.Error(e.ToString());
|
||||
return null;
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -552,7 +552,7 @@ namespace OpenSim.Data.MySQL
|
|||
|
||||
private void StoreRollbackItem(UUID ItemID)
|
||||
{
|
||||
if(rollbackStore == true)
|
||||
if (rollbackStore == true)
|
||||
{
|
||||
string todaysPath = RollbackGetTodaysPath();
|
||||
|
||||
|
@ -1008,7 +1008,7 @@ namespace OpenSim.Data.MySQL
|
|||
StoreRollbackFolder(f.ID);
|
||||
deleteOneFolder(f.ID);
|
||||
|
||||
if(rollbackStore)
|
||||
if (rollbackStore)
|
||||
{
|
||||
foreach (InventoryItemBase itemBase in getInventoryInFolder(f.ID))
|
||||
{
|
||||
|
|
|
@ -0,0 +1,156 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Reflection;
|
||||
using System.Collections.Generic;
|
||||
using log4net;
|
||||
using MySql.Data.MySqlClient;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Data.MySQL
|
||||
{
|
||||
/// <summary>
|
||||
/// A MySQL Interface for the Asset Server
|
||||
/// </summary>
|
||||
public class MySQLXInventoryData : IXInventoryData
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private MySQLGenericTableHandler<XInventoryFolder> m_Folders;
|
||||
private MySqlItemHandler m_Items;
|
||||
|
||||
public MySQLXInventoryData(string conn, string realm)
|
||||
{
|
||||
m_Folders = new MySQLGenericTableHandler<XInventoryFolder>(
|
||||
conn, "inventoryfolders", "InventoryStore");
|
||||
m_Items = new MySqlItemHandler(
|
||||
conn, "inventoryitems", String.Empty);
|
||||
}
|
||||
|
||||
public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
|
||||
{
|
||||
return m_Folders.Get(fields, vals);
|
||||
}
|
||||
|
||||
public XInventoryItem[] GetItems(string[] fields, string[] vals)
|
||||
{
|
||||
return m_Items.Get(fields, vals);
|
||||
}
|
||||
|
||||
public bool StoreFolder(XInventoryFolder folder)
|
||||
{
|
||||
return m_Folders.Store(folder);
|
||||
}
|
||||
|
||||
public bool StoreItem(XInventoryItem item)
|
||||
{
|
||||
return m_Items.Store(item);
|
||||
}
|
||||
|
||||
public bool DeleteFolders(string field, string val)
|
||||
{
|
||||
return m_Folders.Delete(field, val);
|
||||
}
|
||||
|
||||
public bool DeleteItems(string field, string val)
|
||||
{
|
||||
return m_Items.Delete(field, val);
|
||||
}
|
||||
|
||||
public bool MoveItem(string id, string newParent)
|
||||
{
|
||||
return m_Items.MoveItem(id, newParent);
|
||||
}
|
||||
|
||||
public XInventoryItem[] GetActiveGestures(UUID principalID)
|
||||
{
|
||||
return m_Items.GetActiveGestures(principalID);
|
||||
}
|
||||
|
||||
public int GetAssetPermissions(UUID principalID, UUID assetID)
|
||||
{
|
||||
return m_Items.GetAssetPermissions(principalID, assetID);
|
||||
}
|
||||
}
|
||||
|
||||
public class MySqlItemHandler : MySQLGenericTableHandler<XInventoryItem>
|
||||
{
|
||||
public MySqlItemHandler(string c, string t, string m) :
|
||||
base(c, t, m)
|
||||
{
|
||||
}
|
||||
|
||||
public bool MoveItem(string id, string newParent)
|
||||
{
|
||||
MySqlCommand cmd = new MySqlCommand();
|
||||
|
||||
cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where inventoryID = ?InventoryID", m_Realm);
|
||||
cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
|
||||
cmd.Parameters.AddWithValue("?InventoryID", id);
|
||||
|
||||
return ExecuteNonQuery(cmd) == 0 ? false : true;
|
||||
}
|
||||
|
||||
public XInventoryItem[] GetActiveGestures(UUID principalID)
|
||||
{
|
||||
MySqlCommand cmd = new MySqlCommand();
|
||||
cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags = 1", m_Realm);
|
||||
|
||||
cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
|
||||
cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
|
||||
|
||||
return DoQuery(cmd);
|
||||
}
|
||||
|
||||
public int GetAssetPermissions(UUID principalID, UUID assetID)
|
||||
{
|
||||
MySqlCommand cmd = new MySqlCommand();
|
||||
|
||||
cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm);
|
||||
cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
|
||||
cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
|
||||
|
||||
IDataReader reader = ExecuteReader(cmd);
|
||||
|
||||
int perms = 0;
|
||||
|
||||
if (reader.Read())
|
||||
{
|
||||
perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
|
||||
}
|
||||
|
||||
reader.Close();
|
||||
CloseReaderCommand(cmd);
|
||||
|
||||
return perms;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -577,6 +577,7 @@ namespace OpenSim.Data.Tests
|
|||
.IgnoreProperty(x=>x.RegionUUID)
|
||||
.IgnoreProperty(x=>x.Scene)
|
||||
.IgnoreProperty(x=>x.Children)
|
||||
.IgnoreProperty(x=>x.PassCollision)
|
||||
.IgnoreProperty(x=>x.RootPart));
|
||||
}
|
||||
|
||||
|
|
|
@ -1075,7 +1075,7 @@ namespace OpenSim.Framework
|
|||
event SaveStateHandler OnSaveStateEvent;
|
||||
event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
event ParcelBuyPass OnParcelBuyPass;
|
||||
|
|
|
@ -741,7 +741,7 @@ namespace OpenSim.Framework.Servers.HttpServer
|
|||
xmlRpcResponse = new XmlRpcResponse();
|
||||
|
||||
// Code probably set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
|
||||
xmlRpcResponse.SetFault(-32603, errorMessage);
|
||||
xmlRpcResponse.SetFault(-32603, errorMessage);
|
||||
}
|
||||
|
||||
// if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here
|
||||
|
|
|
@ -304,7 +304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
|
@ -828,7 +828,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
public void SendGroupActiveProposals(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> ProposalText)
|
||||
{
|
||||
foreach(KeyValuePair<int, string> Blank in VoteID)
|
||||
foreach (KeyValuePair<int, string> Blank in VoteID)
|
||||
{
|
||||
GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
|
||||
|
||||
|
@ -851,7 +851,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
GAPIRP.ProposalData[0] = ProposalData;
|
||||
OutPacket(GAPIRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
if(VoteID.Count == 0)
|
||||
if (VoteID.Count == 0)
|
||||
{
|
||||
GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
|
||||
|
||||
|
@ -878,7 +878,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
public void SendGroupVoteHistory(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> VoteType, Dictionary<int, string> VoteResult, Dictionary<int, string> ProposalText)
|
||||
{
|
||||
foreach(KeyValuePair<int, string> Blank in VoteID)
|
||||
foreach (KeyValuePair<int, string> Blank in VoteID)
|
||||
{
|
||||
GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
|
||||
|
||||
|
@ -904,7 +904,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
GVHIRP.VoteItem[0] = VoteItem;
|
||||
OutPacket(GVHIRP, ThrottleOutPacketType.Task);
|
||||
}
|
||||
if(VoteID.Count == 0)
|
||||
if (VoteID.Count == 0)
|
||||
{
|
||||
GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
|
||||
|
||||
|
@ -5915,7 +5915,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId)
|
||||
{
|
||||
// Linden Client limitation..
|
||||
// Linden Client limitation..
|
||||
if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.X == 255.5f
|
||||
|| avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y == 255.5f)
|
||||
{
|
||||
|
|
|
@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
|
|||
|
||||
m_scene.ForEachClient(
|
||||
delegate(IClientAPI controller)
|
||||
{
|
||||
{
|
||||
if (controller.AgentId != godID)
|
||||
controller.Kick(reasonStr);
|
||||
}
|
||||
|
|
|
@ -359,12 +359,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
|
|||
|
||||
UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager);
|
||||
if (UUID.Zero != ospResolvedId)
|
||||
{
|
||||
{
|
||||
item.CreatorIdAsUuid = ospResolvedId;
|
||||
|
||||
// XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the
|
||||
// database). Instead, replace with the UUID that we found.
|
||||
item.CreatorId = ospResolvedId.ToString();
|
||||
item.CreatorId = ospResolvedId.ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -117,12 +117,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
|
|||
}
|
||||
|
||||
protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
|
||||
{
|
||||
{
|
||||
Exception reportedException = null;
|
||||
bool succeeded = true;
|
||||
|
||||
try
|
||||
{
|
||||
{
|
||||
// We're almost done. Just need to write out the control file now
|
||||
m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p1ControlFile());
|
||||
m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
|
||||
|
@ -269,7 +269,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
|
|||
m_module.TriggerInventoryArchiveSaved(
|
||||
m_id, false, m_userInfo, m_invPath, m_saveStream,
|
||||
new Exception(errorMessage));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
m_archiveWriter = new TarArchiveWriter(m_saveStream);
|
||||
|
|
|
@ -484,11 +484,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
|
|||
QueryDataMap.Add("GlobalZ", OSD.FromInteger((int)groupDataBlock.GlobalZ));
|
||||
QueryDataMap.Add("Name", OSD.FromBinary(groupDataBlock.Name));
|
||||
QueryDataMap.Add("OwnerID", OSD.FromUUID(groupDataBlock.OwnerID));
|
||||
QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName));
|
||||
QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID));
|
||||
QueryDataMap.Add("ProductSku", OSD.FromInteger(0));
|
||||
QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price));
|
||||
|
||||
QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName));
|
||||
QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID));
|
||||
QueryDataMap.Add("ProductSku", OSD.FromInteger(0));
|
||||
QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price));
|
||||
|
||||
QueryData.Add(QueryDataMap);
|
||||
}
|
||||
body.Add("QueryData", QueryData);
|
||||
|
|
|
@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
|||
List<string> serialisedParcels = new List<string>();
|
||||
string filePath = "NONE";
|
||||
|
||||
TarArchiveReader archive = new TarArchiveReader(m_loadStream);
|
||||
TarArchiveReader archive = new TarArchiveReader(m_loadStream);
|
||||
byte[] data;
|
||||
TarArchiveReader.TarEntryType entryType;
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
|||
|
||||
m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName);
|
||||
|
||||
m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
|
||||
m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
|
||||
}
|
||||
|
||||
protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
|
||||
|
|
|
@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
|||
/// <value>
|
||||
/// The file used to load and save an opensimulator archive if no filename has been specified
|
||||
/// </value>
|
||||
protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
|
||||
protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
|
||||
|
||||
public string Name
|
||||
{
|
||||
|
@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
|||
{
|
||||
DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Save a region to a file, including all the assets needed to restore it.
|
||||
|
|
|
@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.World.Land
|
|||
ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
|
||||
obj.LandData.Name = "NO LAND";
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
|
||||
public List<ILandObject> AllParcels()
|
||||
{
|
||||
|
|
|
@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.World.Land
|
|||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -817,7 +817,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
|||
}
|
||||
|
||||
protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers)
|
||||
{
|
||||
{
|
||||
if (parcel.LandData.OwnerID == user)
|
||||
{
|
||||
// Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on
|
||||
|
|
|
@ -275,24 +275,24 @@ namespace OpenSim.Region.Examples.SimpleModule
|
|||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
|||
/// </summary>
|
||||
/// <param name="position"></param>
|
||||
/// <returns></returns>
|
||||
List<ILandObject> ParcelsNearPoint(Vector3 position);
|
||||
List<ILandObject> ParcelsNearPoint(Vector3 position);
|
||||
|
||||
/// <summary>
|
||||
/// Get the parcel given the land's local id.
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
|||
/// Interface to region archive functionality
|
||||
/// </summary>
|
||||
public interface IRegionArchiverModule
|
||||
{
|
||||
{
|
||||
void HandleLoadOarConsoleCommand(string module, string[] cmdparams);
|
||||
void HandleSaveOarConsoleCommand(string module, string[] cmdparams);
|
||||
|
||||
|
|
|
@ -2054,6 +2054,13 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
group.Children.Count, remoteClient.AgentId, pos)
|
||||
&& !attachment)
|
||||
{
|
||||
// The client operates in no fail mode. It will
|
||||
// have already removed the item from the folder
|
||||
// if it's no copy.
|
||||
// Put it back if it's not an attachment
|
||||
//
|
||||
if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
|
||||
remoteClient.SendBulkUpdateInventory(item);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -400,11 +400,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
get { return StatsReporter.getLastReportedSimFPS(); }
|
||||
}
|
||||
|
||||
public float[] SimulatorStats
|
||||
{
|
||||
get { return StatsReporter.getLastReportedSimStats(); }
|
||||
}
|
||||
|
||||
public float[] SimulatorStats
|
||||
{
|
||||
get { return StatsReporter.getLastReportedSimStats(); }
|
||||
}
|
||||
|
||||
public string DefaultScriptEngine
|
||||
{
|
||||
|
|
|
@ -1893,11 +1893,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
string data = "";
|
||||
if (obj != null)
|
||||
{
|
||||
if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this object
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = obj.UUID;
|
||||
|
@ -1919,7 +1919,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = obj.UUID;
|
||||
|
@ -1944,11 +1944,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (av.LocalId == localId)
|
||||
{
|
||||
if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this avatar
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = av.UUID;
|
||||
|
@ -1970,7 +1970,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = av.UUID;
|
||||
|
@ -1998,7 +1998,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (m_parentGroup.Scene == null)
|
||||
return;
|
||||
if(m_parentGroup.PassCollision == true)
|
||||
if (m_parentGroup.PassCollision == true)
|
||||
{
|
||||
//TODO: Add pass to root prim!
|
||||
}
|
||||
|
@ -2029,11 +2029,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
string data = "";
|
||||
if (obj != null)
|
||||
{
|
||||
if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this object
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = obj.UUID;
|
||||
|
@ -2055,7 +2055,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = obj.UUID;
|
||||
|
@ -2080,11 +2080,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (av.LocalId == localId)
|
||||
{
|
||||
if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this avatar
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = av.UUID;
|
||||
|
@ -2106,7 +2106,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = av.UUID;
|
||||
|
@ -2160,11 +2160,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
string data = "";
|
||||
if (obj != null)
|
||||
{
|
||||
if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this object
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = obj.UUID;
|
||||
|
@ -2186,7 +2186,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = obj.UUID;
|
||||
|
@ -2211,11 +2211,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (av.LocalId == localId)
|
||||
{
|
||||
if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
|
||||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this avatar
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = av.UUID;
|
||||
|
@ -2237,7 +2237,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
|
||||
//If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
DetectedObject detobj = new DetectedObject();
|
||||
detobj.keyUUID = av.UUID;
|
||||
|
@ -2881,8 +2881,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
m_parentGroup.stopLookAt();
|
||||
|
||||
m_parentGroup.ScheduleGroupForTerseUpdate();
|
||||
}
|
||||
m_parentGroup.ScheduleGroupForTerseUpdate();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Set the text displayed for this part.
|
||||
|
|
|
@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
|
||||
{
|
||||
SitRaycastFindEdge(collisionPoint, normal);
|
||||
m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal );
|
||||
m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
private int m_fps = 0;
|
||||
// saved last reported value so there is something available for llGetRegionFPS
|
||||
private float lastReportedSimFPS = 0;
|
||||
private float[] lastReportedSimStats = new float[21];
|
||||
private float[] lastReportedSimStats = new float[21];
|
||||
private float m_pfps = 0;
|
||||
private int m_agentUpdates = 0;
|
||||
|
||||
|
@ -263,11 +263,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
sb[20].StatID = (uint)Stats.ScriptLinesPerSecond;
|
||||
sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor;
|
||||
|
||||
for (int i = 0; i < 21; i++)
|
||||
{
|
||||
lastReportedSimStats[i] = sb[i].StatValue;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 21; i++)
|
||||
{
|
||||
lastReportedSimStats[i] = sb[i].StatValue;
|
||||
}
|
||||
|
||||
SimStats simStats
|
||||
= new SimStats(
|
||||
|
@ -447,11 +447,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
return lastReportedSimFPS;
|
||||
}
|
||||
|
||||
public float[] getLastReportedSimStats()
|
||||
{
|
||||
return lastReportedSimStats;
|
||||
}
|
||||
|
||||
public float[] getLastReportedSimStats()
|
||||
{
|
||||
return lastReportedSimStats;
|
||||
}
|
||||
|
||||
public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes)
|
||||
{
|
||||
|
|
|
@ -837,24 +837,24 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
|||
public event AvatarInterestUpdate OnAvatarInterestUpdate;
|
||||
public event PlacesQuery OnPlacesQuery;
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
|
@ -179,8 +179,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
/// </summary>
|
||||
/// <param name="msg">The message to send to the user</param>
|
||||
void Say(string msg);
|
||||
|
||||
void Say(string msg,int channel);
|
||||
|
||||
void Say(string msg,int channel);
|
||||
|
||||
//// <value>
|
||||
/// Grants access to the objects inventory
|
||||
|
|
|
@ -264,7 +264,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
if (CanEdit())
|
||||
{
|
||||
GetSOP().SitTargetPosition = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
if (CanEdit())
|
||||
{
|
||||
GetSOP().SitName = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -288,7 +288,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
if (CanEdit())
|
||||
{
|
||||
GetSOP().TouchName = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -384,7 +384,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
m_rootScene.SimChat(msg, ChatTypeEnum.Say, sop.AbsolutePosition, sop.Name, sop.UUID, false);
|
||||
}
|
||||
|
||||
public void Say(string msg,int channel)
|
||||
public void Say(string msg,int channel)
|
||||
{
|
||||
if (!CanEdit())
|
||||
return;
|
||||
|
@ -392,7 +392,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
SceneObjectPart sop = GetSOP();
|
||||
m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false);
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
|
|
|
@ -149,7 +149,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security);
|
||||
e.Text = chat.Message;
|
||||
e.Channel = chat.Channel;
|
||||
|
||||
|
||||
_OnChat(this, e);
|
||||
return;
|
||||
}
|
||||
|
@ -160,7 +160,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
|||
e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security);
|
||||
e.Text = chat.Message;
|
||||
e.Channel = chat.Channel;
|
||||
|
||||
|
||||
_OnChat(this, e);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -381,24 +381,24 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
|||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
|
@ -305,22 +305,22 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
|
|||
|
||||
public override Quaternion APIDTarget
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override bool APIDActive
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override float APIDStrength
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override float APIDDamping
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override void SubscribeEvents(int ms)
|
||||
|
|
|
@ -623,22 +623,22 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
|
|||
|
||||
public override Quaternion APIDTarget
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override bool APIDActive
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override float APIDStrength
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
public override float APIDDamping
|
||||
{
|
||||
set { return; }
|
||||
set { return; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -243,7 +243,7 @@ namespace OpenSim.Region.Physics.Manager
|
|||
public abstract PIDHoverType PIDHoverType { set;}
|
||||
public abstract float PIDHoverTau { set;}
|
||||
|
||||
// For RotLookAt
|
||||
// For RotLookAt
|
||||
public abstract Quaternion APIDTarget { set;}
|
||||
public abstract bool APIDActive { set;}
|
||||
public abstract float APIDStrength { set;}
|
||||
|
|
|
@ -32,11 +32,11 @@
|
|||
* ODEDynamics.cs contains methods dealing with Prim Physical motion
|
||||
* (dynamics) and the associated settings. Old Linear and angular
|
||||
* motors for dynamic motion have been replace with MoveLinear()
|
||||
* and MoveAngular(); 'Physical' is used only to switch ODE dynamic
|
||||
* and MoveAngular(); 'Physical' is used only to switch ODE dynamic
|
||||
* simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
|
||||
* switch between 'VEHICLE' parameter use and general dynamics
|
||||
* settings use.
|
||||
*/
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
public class ODEDynamics
|
||||
{
|
||||
public Vehicle Type
|
||||
{
|
||||
{
|
||||
get { return m_type; }
|
||||
}
|
||||
|
||||
|
@ -62,14 +62,14 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
get { return m_body; }
|
||||
}
|
||||
|
||||
private int frcount = 0; // Used to limit dynamics debug output to
|
||||
// every 100th frame
|
||||
private int frcount = 0; // Used to limit dynamics debug output to
|
||||
// every 100th frame
|
||||
|
||||
// private OdeScene m_parentScene = null;
|
||||
private IntPtr m_body = IntPtr.Zero;
|
||||
// private IntPtr m_jointGroup = IntPtr.Zero;
|
||||
// private IntPtr m_aMotor = IntPtr.Zero;
|
||||
|
||||
|
||||
|
||||
// Vehicle properties
|
||||
private Vehicle m_type = Vehicle.TYPE_NONE; // If a 'VEHICLE', and what kind
|
||||
|
@ -82,7 +82,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// HOVER_UP_ONLY
|
||||
// LIMIT_MOTOR_UP
|
||||
// LIMIT_ROLL_ONLY
|
||||
|
||||
|
||||
// Linear properties
|
||||
private Vector3 m_linearMotorDirection = Vector3.Zero; // velocity requested by LSL, decayed by time
|
||||
private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero; // velocity requested by LSL
|
||||
|
@ -91,47 +91,43 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
private float m_linearMotorDecayTimescale = 0;
|
||||
private float m_linearMotorTimescale = 0;
|
||||
private Vector3 m_lastLinearVelocityVector = Vector3.Zero;
|
||||
// private bool m_LinearMotorSetLastFrame = false;
|
||||
// private bool m_LinearMotorSetLastFrame = false;
|
||||
// private Vector3 m_linearMotorOffset = Vector3.Zero;
|
||||
|
||||
|
||||
//Angular properties
|
||||
private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
|
||||
private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
|
||||
private int m_angularMotorApply = 0; // application frame counter
|
||||
private Vector3 m_angularMotorVelocity = Vector3.Zero; // current angular motor velocity
|
||||
private Vector3 m_angularMotorVelocity = Vector3.Zero; // current angular motor velocity
|
||||
private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate
|
||||
private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate
|
||||
private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate
|
||||
private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body
|
||||
// private Vector3 m_lastVertAttractor = Vector3.Zero; // what VA was last applied to body
|
||||
|
||||
//Deflection properties
|
||||
//Deflection properties
|
||||
// private float m_angularDeflectionEfficiency = 0;
|
||||
// private float m_angularDeflectionTimescale = 0;
|
||||
// private float m_linearDeflectionEfficiency = 0;
|
||||
// private float m_linearDeflectionTimescale = 0;
|
||||
|
||||
|
||||
//Banking properties
|
||||
// private float m_bankingEfficiency = 0;
|
||||
// private float m_bankingMix = 0;
|
||||
// private float m_bankingTimescale = 0;
|
||||
|
||||
|
||||
//Hover and Buoyancy properties
|
||||
private float m_VhoverHeight = 0f;
|
||||
// private float m_VhoverEfficiency = 0f;
|
||||
private float m_VhoverTimescale = 0f;
|
||||
private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
|
||||
private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
|
||||
private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle.
|
||||
// Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
|
||||
// KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
|
||||
// Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
|
||||
|
||||
//Attractor properties
|
||||
// Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
|
||||
// KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
|
||||
// Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
|
||||
|
||||
//Attractor properties
|
||||
private float m_verticalAttractionEfficiency = 1.0f; // damped
|
||||
private float m_verticalAttractionTimescale = 500f; // Timescale > 300 means no vert attractor.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
|
||||
{
|
||||
|
@ -166,13 +162,13 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// m_bankingTimescale = pValue;
|
||||
break;
|
||||
case Vehicle.BUOYANCY:
|
||||
if (pValue < -1f) pValue = -1f;
|
||||
if (pValue > 1f) pValue = 1f;
|
||||
if (pValue < -1f) pValue = -1f;
|
||||
if (pValue > 1f) pValue = 1f;
|
||||
m_VehicleBuoyancy = pValue;
|
||||
break;
|
||||
// case Vehicle.HOVER_EFFICIENCY:
|
||||
// if (pValue < 0f) pValue = 0f;
|
||||
// if (pValue > 1f) pValue = 1f;
|
||||
// if (pValue < 0f) pValue = 0f;
|
||||
// if (pValue > 1f) pValue = 1f;
|
||||
// m_VhoverEfficiency = pValue;
|
||||
// break;
|
||||
case Vehicle.HOVER_HEIGHT:
|
||||
|
@ -199,7 +195,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_linearMotorTimescale = pValue;
|
||||
break;
|
||||
case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
|
||||
if (pValue < 0.1f) pValue = 0.1f; // Less goes unstable
|
||||
if (pValue < 0.1f) pValue = 0.1f; // Less goes unstable
|
||||
if (pValue > 1.0f) pValue = 1.0f;
|
||||
m_verticalAttractionEfficiency = pValue;
|
||||
break;
|
||||
|
@ -207,8 +203,8 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
if (pValue < 0.01f) pValue = 0.01f;
|
||||
m_verticalAttractionTimescale = pValue;
|
||||
break;
|
||||
|
||||
// These are vector properties but the engine lets you use a single float value to
|
||||
|
||||
// These are vector properties but the engine lets you use a single float value to
|
||||
// set all of the components to the same value
|
||||
case Vehicle.ANGULAR_FRICTION_TIMESCALE:
|
||||
m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
|
||||
|
@ -229,7 +225,6 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
break;
|
||||
|
||||
}
|
||||
|
||||
}//end ProcessFloatVehicleParam
|
||||
|
||||
internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
|
||||
|
@ -242,12 +237,12 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
case Vehicle.ANGULAR_MOTOR_DIRECTION:
|
||||
m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
|
||||
// Limit requested angular speed to 2 rps= 4 pi rads/sec
|
||||
if(m_angularMotorDirection.X > 12.56f) m_angularMotorDirection.X = 12.56f;
|
||||
if(m_angularMotorDirection.X < - 12.56f) m_angularMotorDirection.X = - 12.56f;
|
||||
if(m_angularMotorDirection.Y > 12.56f) m_angularMotorDirection.Y = 12.56f;
|
||||
if(m_angularMotorDirection.Y < - 12.56f) m_angularMotorDirection.Y = - 12.56f;
|
||||
if(m_angularMotorDirection.Z > 12.56f) m_angularMotorDirection.Z = 12.56f;
|
||||
if(m_angularMotorDirection.Z < - 12.56f) m_angularMotorDirection.Z = - 12.56f;
|
||||
if (m_angularMotorDirection.X > 12.56f) m_angularMotorDirection.X = 12.56f;
|
||||
if (m_angularMotorDirection.X < - 12.56f) m_angularMotorDirection.X = - 12.56f;
|
||||
if (m_angularMotorDirection.Y > 12.56f) m_angularMotorDirection.Y = 12.56f;
|
||||
if (m_angularMotorDirection.Y < - 12.56f) m_angularMotorDirection.Y = - 12.56f;
|
||||
if (m_angularMotorDirection.Z > 12.56f) m_angularMotorDirection.Z = 12.56f;
|
||||
if (m_angularMotorDirection.Z < - 12.56f) m_angularMotorDirection.Z = - 12.56f;
|
||||
m_angularMotorApply = 10;
|
||||
break;
|
||||
case Vehicle.LINEAR_FRICTION_TIMESCALE:
|
||||
|
@ -261,7 +256,6 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
|
||||
break;
|
||||
}
|
||||
|
||||
}//end ProcessVectorVehicleParam
|
||||
|
||||
internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
|
||||
|
@ -272,12 +266,11 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// m_referenceFrame = pValue;
|
||||
break;
|
||||
}
|
||||
|
||||
}//end ProcessRotationVehicleParam
|
||||
|
||||
internal void ProcessTypeChange(Vehicle pType)
|
||||
{
|
||||
// Set Defaults For Type
|
||||
// Set Defaults For Type
|
||||
m_type = pType;
|
||||
switch (pType)
|
||||
{
|
||||
|
@ -357,8 +350,8 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// m_bankingMix = 0.8f;
|
||||
// m_bankingTimescale = 1;
|
||||
// m_referenceFrame = Quaternion.Identity;
|
||||
m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY |
|
||||
VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
|
||||
m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY |
|
||||
VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
|
||||
m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY |
|
||||
VehicleFlag.LIMIT_MOTOR_UP);
|
||||
break;
|
||||
|
@ -432,24 +425,25 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE)
|
||||
return;
|
||||
frcount++; // used to limit debug comment output
|
||||
frcount++; // used to limit debug comment output
|
||||
if (frcount > 100)
|
||||
frcount = 0;
|
||||
|
||||
MoveLinear(pTimestep, pParentScene);
|
||||
MoveLinear(pTimestep, pParentScene);
|
||||
MoveAngular(pTimestep);
|
||||
}// end Step
|
||||
|
||||
private void MoveLinear(float pTimestep, OdeScene _pParentScene)
|
||||
{
|
||||
if (!m_linearMotorDirection.ApproxEquals(Vector3.Zero, 0.01f)) // requested m_linearMotorDirection is significant
|
||||
if (!m_linearMotorDirection.ApproxEquals(Vector3.Zero, 0.01f)) // requested m_linearMotorDirection is significant
|
||||
{
|
||||
if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
|
||||
if (!d.BodyIsEnabled(Body))
|
||||
d.BodyEnable(Body);
|
||||
|
||||
// add drive to body
|
||||
Vector3 addAmount = m_linearMotorDirection/(m_linearMotorTimescale/pTimestep);
|
||||
m_lastLinearVelocityVector += (addAmount*10); // lastLinearVelocityVector is the current body velocity vector?
|
||||
|
||||
m_lastLinearVelocityVector += (addAmount*10); // lastLinearVelocityVector is the current body velocity vector?
|
||||
|
||||
// This will work temporarily, but we really need to compare speed on an axis
|
||||
// KF: Limit body velocity to applied velocity?
|
||||
if (Math.Abs(m_lastLinearVelocityVector.X) > Math.Abs(m_linearMotorDirectionLASTSET.X))
|
||||
|
@ -458,7 +452,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_lastLinearVelocityVector.Y = m_linearMotorDirectionLASTSET.Y;
|
||||
if (Math.Abs(m_lastLinearVelocityVector.Z) > Math.Abs(m_linearMotorDirectionLASTSET.Z))
|
||||
m_lastLinearVelocityVector.Z = m_linearMotorDirectionLASTSET.Z;
|
||||
|
||||
|
||||
// decay applied velocity
|
||||
Vector3 decayfraction = ((Vector3.One/(m_linearMotorDecayTimescale/pTimestep)));
|
||||
//Console.WriteLine("decay: " + decayfraction);
|
||||
|
@ -466,194 +460,192 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
//Console.WriteLine("actual: " + m_linearMotorDirection);
|
||||
}
|
||||
else
|
||||
{ // requested is not significant
|
||||
// if what remains of applied is small, zero it.
|
||||
if (m_lastLinearVelocityVector.ApproxEquals(Vector3.Zero, 0.01f))
|
||||
m_lastLinearVelocityVector = Vector3.Zero;
|
||||
}
|
||||
|
||||
|
||||
// convert requested object velocity to world-referenced vector
|
||||
{ // requested is not significant
|
||||
// if what remains of applied is small, zero it.
|
||||
if (m_lastLinearVelocityVector.ApproxEquals(Vector3.Zero, 0.01f))
|
||||
m_lastLinearVelocityVector = Vector3.Zero;
|
||||
}
|
||||
|
||||
// convert requested object velocity to world-referenced vector
|
||||
m_dir = m_lastLinearVelocityVector;
|
||||
d.Quaternion rot = d.BodyGetQuaternion(Body);
|
||||
Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W); // rotq = rotation of object
|
||||
m_dir *= rotq; // apply obj rotation to velocity vector
|
||||
Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W); // rotq = rotation of object
|
||||
m_dir *= rotq; // apply obj rotation to velocity vector
|
||||
|
||||
// add Gravity andBuoyancy
|
||||
// KF: So far I have found no good method to combine a script-requested
|
||||
// .Z velocity and gravity. Therefore only 0g will used script-requested
|
||||
// .Z velocity. >0g (m_VehicleBuoyancy < 1) will used modified gravity only.
|
||||
// add Gravity andBuoyancy
|
||||
// KF: So far I have found no good method to combine a script-requested
|
||||
// .Z velocity and gravity. Therefore only 0g will used script-requested
|
||||
// .Z velocity. >0g (m_VehicleBuoyancy < 1) will used modified gravity only.
|
||||
Vector3 grav = Vector3.Zero;
|
||||
if(m_VehicleBuoyancy < 1.0f)
|
||||
{
|
||||
// There is some gravity, make a gravity force vector
|
||||
// that is applied after object velocity.
|
||||
d.Mass objMass;
|
||||
d.BodyGetMass(Body, out objMass);
|
||||
// m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g;
|
||||
grav.Z = _pParentScene.gravityz * objMass.mass * (1f - m_VehicleBuoyancy);
|
||||
// Preserve the current Z velocity
|
||||
d.Vector3 vel_now = d.BodyGetLinearVel(Body);
|
||||
m_dir.Z = vel_now.Z; // Preserve the accumulated falling velocity
|
||||
} // else its 1.0, no gravity.
|
||||
|
||||
// Check if hovering
|
||||
if( (m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
|
||||
{
|
||||
// We should hover, get the target height
|
||||
d.Vector3 pos = d.BodyGetPosition(Body);
|
||||
if((m_flags & VehicleFlag.HOVER_WATER_ONLY) == VehicleFlag.HOVER_WATER_ONLY)
|
||||
{
|
||||
m_VhoverTargetHeight = _pParentScene.GetWaterLevel() + m_VhoverHeight;
|
||||
}
|
||||
else if((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) == VehicleFlag.HOVER_TERRAIN_ONLY)
|
||||
{
|
||||
m_VhoverTargetHeight = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
|
||||
}
|
||||
else if((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == VehicleFlag.HOVER_GLOBAL_HEIGHT)
|
||||
{
|
||||
m_VhoverTargetHeight = m_VhoverHeight;
|
||||
}
|
||||
|
||||
if((m_flags & VehicleFlag.HOVER_UP_ONLY) == VehicleFlag.HOVER_UP_ONLY)
|
||||
{
|
||||
// If body is aready heigher, use its height as target height
|
||||
if(pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
|
||||
}
|
||||
|
||||
// m_VhoverEfficiency = 0f; // 0=boucy, 1=Crit.damped
|
||||
// m_VhoverTimescale = 0f; // time to acheive height
|
||||
// pTimestep is time since last frame,in secs
|
||||
float herr0 = pos.Z - m_VhoverTargetHeight;
|
||||
// Replace Vertical speed with correction figure if significant
|
||||
if(Math.Abs(herr0) > 0.01f )
|
||||
{
|
||||
d.Mass objMass;
|
||||
d.BodyGetMass(Body, out objMass);
|
||||
m_dir.Z = - ( (herr0 * pTimestep * 50.0f) / m_VhoverTimescale);
|
||||
//KF: m_VhoverEfficiency is not yet implemented
|
||||
}
|
||||
else
|
||||
{
|
||||
m_dir.Z = 0f;
|
||||
}
|
||||
}
|
||||
|
||||
// Apply velocity
|
||||
d.BodySetLinearVel(Body, m_dir.X, m_dir.Y, m_dir.Z);
|
||||
if (m_VehicleBuoyancy < 1.0f)
|
||||
{
|
||||
// There is some gravity, make a gravity force vector
|
||||
// that is applied after object velocity.
|
||||
d.Mass objMass;
|
||||
d.BodyGetMass(Body, out objMass);
|
||||
// m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g;
|
||||
grav.Z = _pParentScene.gravityz * objMass.mass * (1f - m_VehicleBuoyancy);
|
||||
// Preserve the current Z velocity
|
||||
d.Vector3 vel_now = d.BodyGetLinearVel(Body);
|
||||
m_dir.Z = vel_now.Z; // Preserve the accumulated falling velocity
|
||||
} // else its 1.0, no gravity.
|
||||
|
||||
// Check if hovering
|
||||
if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
|
||||
{
|
||||
// We should hover, get the target height
|
||||
d.Vector3 pos = d.BodyGetPosition(Body);
|
||||
if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) == VehicleFlag.HOVER_WATER_ONLY)
|
||||
{
|
||||
m_VhoverTargetHeight = _pParentScene.GetWaterLevel() + m_VhoverHeight;
|
||||
}
|
||||
else if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) == VehicleFlag.HOVER_TERRAIN_ONLY)
|
||||
{
|
||||
m_VhoverTargetHeight = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
|
||||
}
|
||||
else if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == VehicleFlag.HOVER_GLOBAL_HEIGHT)
|
||||
{
|
||||
m_VhoverTargetHeight = m_VhoverHeight;
|
||||
}
|
||||
|
||||
if ((m_flags & VehicleFlag.HOVER_UP_ONLY) == VehicleFlag.HOVER_UP_ONLY)
|
||||
{
|
||||
// If body is aready heigher, use its height as target height
|
||||
if (pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
|
||||
}
|
||||
|
||||
// m_VhoverEfficiency = 0f; // 0=boucy, 1=Crit.damped
|
||||
// m_VhoverTimescale = 0f; // time to acheive height
|
||||
// pTimestep is time since last frame,in secs
|
||||
float herr0 = pos.Z - m_VhoverTargetHeight;
|
||||
// Replace Vertical speed with correction figure if significant
|
||||
if (Math.Abs(herr0) > 0.01f)
|
||||
{
|
||||
d.Mass objMass;
|
||||
d.BodyGetMass(Body, out objMass);
|
||||
m_dir.Z = - ((herr0 * pTimestep * 50.0f) / m_VhoverTimescale);
|
||||
//KF: m_VhoverEfficiency is not yet implemented
|
||||
}
|
||||
else
|
||||
{
|
||||
m_dir.Z = 0f;
|
||||
}
|
||||
}
|
||||
|
||||
// Apply velocity
|
||||
d.BodySetLinearVel(Body, m_dir.X, m_dir.Y, m_dir.Z);
|
||||
// apply gravity force
|
||||
d.BodyAddForce(Body, grav.X, grav.Y, grav.Z);
|
||||
d.BodyAddForce(Body, grav.X, grav.Y, grav.Z);
|
||||
|
||||
|
||||
// apply friction
|
||||
// apply friction
|
||||
Vector3 decayamount = Vector3.One / (m_linearFrictionTimescale / pTimestep);
|
||||
m_lastLinearVelocityVector -= m_lastLinearVelocityVector * decayamount;
|
||||
} // end MoveLinear()
|
||||
|
||||
|
||||
private void MoveAngular(float pTimestep)
|
||||
{
|
||||
/*
|
||||
private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
|
||||
private int m_angularMotorApply = 0; // application frame counter
|
||||
private float m_angularMotorVelocity = 0; // current angular motor velocity (ramps up and down)
|
||||
private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate
|
||||
private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate
|
||||
private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate
|
||||
private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body
|
||||
*/
|
||||
|
||||
// Get what the body is doing, this includes 'external' influences
|
||||
d.Vector3 angularVelocity = d.BodyGetAngularVel(Body);
|
||||
// Vector3 angularVelocity = Vector3.Zero;
|
||||
|
||||
if (m_angularMotorApply > 0)
|
||||
{
|
||||
// ramp up to new value
|
||||
// current velocity += error / ( time to get there / step interval )
|
||||
// requested speed - last motor speed
|
||||
m_angularMotorVelocity.X += (m_angularMotorDirection.X - m_angularMotorVelocity.X) / (m_angularMotorTimescale / pTimestep);
|
||||
m_angularMotorVelocity.Y += (m_angularMotorDirection.Y - m_angularMotorVelocity.Y) / (m_angularMotorTimescale / pTimestep);
|
||||
m_angularMotorVelocity.Z += (m_angularMotorDirection.Z - m_angularMotorVelocity.Z) / (m_angularMotorTimescale / pTimestep);
|
||||
/*
|
||||
private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
|
||||
private int m_angularMotorApply = 0; // application frame counter
|
||||
private float m_angularMotorVelocity = 0; // current angular motor velocity (ramps up and down)
|
||||
private float m_angularMotorTimescale = 0; // motor angular velocity ramp up rate
|
||||
private float m_angularMotorDecayTimescale = 0; // motor angular velocity decay rate
|
||||
private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular velocity decay rate
|
||||
private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body
|
||||
*/
|
||||
|
||||
m_angularMotorApply--; // This is done so that if script request rate is less than phys frame rate the expected
|
||||
// velocity may still be acheived.
|
||||
}
|
||||
else
|
||||
{
|
||||
// no motor recently applied, keep the body velocity
|
||||
/* m_angularMotorVelocity.X = angularVelocity.X;
|
||||
m_angularMotorVelocity.Y = angularVelocity.Y;
|
||||
m_angularMotorVelocity.Z = angularVelocity.Z; */
|
||||
|
||||
// and decay the velocity
|
||||
m_angularMotorVelocity -= m_angularMotorVelocity / (m_angularMotorDecayTimescale / pTimestep);
|
||||
} // end motor section
|
||||
|
||||
// Get what the body is doing, this includes 'external' influences
|
||||
d.Vector3 angularVelocity = d.BodyGetAngularVel(Body);
|
||||
// Vector3 angularVelocity = Vector3.Zero;
|
||||
|
||||
if (m_angularMotorApply > 0)
|
||||
{
|
||||
// ramp up to new value
|
||||
// current velocity += error / (time to get there / step interval)
|
||||
// requested speed - last motor speed
|
||||
m_angularMotorVelocity.X += (m_angularMotorDirection.X - m_angularMotorVelocity.X) / (m_angularMotorTimescale / pTimestep);
|
||||
m_angularMotorVelocity.Y += (m_angularMotorDirection.Y - m_angularMotorVelocity.Y) / (m_angularMotorTimescale / pTimestep);
|
||||
m_angularMotorVelocity.Z += (m_angularMotorDirection.Z - m_angularMotorVelocity.Z) / (m_angularMotorTimescale / pTimestep);
|
||||
|
||||
m_angularMotorApply--; // This is done so that if script request rate is less than phys frame rate the expected
|
||||
// velocity may still be acheived.
|
||||
}
|
||||
else
|
||||
{
|
||||
// no motor recently applied, keep the body velocity
|
||||
/* m_angularMotorVelocity.X = angularVelocity.X;
|
||||
m_angularMotorVelocity.Y = angularVelocity.Y;
|
||||
m_angularMotorVelocity.Z = angularVelocity.Z; */
|
||||
|
||||
// and decay the velocity
|
||||
m_angularMotorVelocity -= m_angularMotorVelocity / (m_angularMotorDecayTimescale / pTimestep);
|
||||
} // end motor section
|
||||
|
||||
// Vertical attractor section
|
||||
Vector3 vertattr = Vector3.Zero;
|
||||
|
||||
if(m_verticalAttractionTimescale < 300)
|
||||
{
|
||||
float VAservo = 0.2f / (m_verticalAttractionTimescale * pTimestep);
|
||||
// get present body rotation
|
||||
d.Quaternion rot = d.BodyGetQuaternion(Body);
|
||||
Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
|
||||
// make a vector pointing up
|
||||
Vector3 verterr = Vector3.Zero;
|
||||
verterr.Z = 1.0f;
|
||||
// rotate it to Body Angle
|
||||
verterr = verterr * rotq;
|
||||
// verterr.X and .Y are the World error ammounts. They are 0 when there is no error (Vehicle Body is 'vertical'), and .Z will be 1.
|
||||
// As the body leans to its side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall and .Z will go
|
||||
// negative. Similar for tilt and |.Y|. .X and .Y must be modulated to prevent a stable inverted body.
|
||||
if (verterr.Z < 0.0f)
|
||||
{
|
||||
verterr.X = 2.0f - verterr.X;
|
||||
verterr.Y = 2.0f - verterr.Y;
|
||||
}
|
||||
// Error is 0 (no error) to +/- 2 (max error)
|
||||
// scale it by VAservo
|
||||
verterr = verterr * VAservo;
|
||||
//if(frcount == 0) Console.WriteLine("VAerr=" + verterr);
|
||||
Vector3 vertattr = Vector3.Zero;
|
||||
|
||||
// As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so
|
||||
// Change Body angular velocity X based on Y, and Y based on X. Z is not changed.
|
||||
vertattr.X = verterr.Y;
|
||||
vertattr.Y = - verterr.X;
|
||||
vertattr.Z = 0f;
|
||||
|
||||
// scaling appears better usingsquare-law
|
||||
float bounce = 1.0f - (m_verticalAttractionEfficiency * m_verticalAttractionEfficiency);
|
||||
vertattr.X += bounce * angularVelocity.X;
|
||||
vertattr.Y += bounce * angularVelocity.Y;
|
||||
|
||||
} // else vertical attractor is off
|
||||
|
||||
// m_lastVertAttractor = vertattr;
|
||||
|
||||
// Bank section tba
|
||||
// Deflection section tba
|
||||
|
||||
// Sum velocities
|
||||
m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection
|
||||
|
||||
if (!m_lastAngularVelocity.ApproxEquals(Vector3.Zero, 0.01f))
|
||||
if (m_verticalAttractionTimescale < 300)
|
||||
{
|
||||
if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lastAngularVelocity = Vector3.Zero; // Reduce small value to zero.
|
||||
}
|
||||
|
||||
// apply friction
|
||||
float VAservo = 0.2f / (m_verticalAttractionTimescale * pTimestep);
|
||||
// get present body rotation
|
||||
d.Quaternion rot = d.BodyGetQuaternion(Body);
|
||||
Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
|
||||
// make a vector pointing up
|
||||
Vector3 verterr = Vector3.Zero;
|
||||
verterr.Z = 1.0f;
|
||||
// rotate it to Body Angle
|
||||
verterr = verterr * rotq;
|
||||
// verterr.X and .Y are the World error ammounts. They are 0 when there is no error (Vehicle Body is 'vertical'), and .Z will be 1.
|
||||
// As the body leans to its side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall and .Z will go
|
||||
// negative. Similar for tilt and |.Y|. .X and .Y must be modulated to prevent a stable inverted body.
|
||||
if (verterr.Z < 0.0f)
|
||||
{
|
||||
verterr.X = 2.0f - verterr.X;
|
||||
verterr.Y = 2.0f - verterr.Y;
|
||||
}
|
||||
// Error is 0 (no error) to +/- 2 (max error)
|
||||
// scale it by VAservo
|
||||
verterr = verterr * VAservo;
|
||||
//if (frcount == 0) Console.WriteLine("VAerr=" + verterr);
|
||||
|
||||
// As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so
|
||||
// Change Body angular velocity X based on Y, and Y based on X. Z is not changed.
|
||||
vertattr.X = verterr.Y;
|
||||
vertattr.Y = - verterr.X;
|
||||
vertattr.Z = 0f;
|
||||
|
||||
// scaling appears better usingsquare-law
|
||||
float bounce = 1.0f - (m_verticalAttractionEfficiency * m_verticalAttractionEfficiency);
|
||||
vertattr.X += bounce * angularVelocity.X;
|
||||
vertattr.Y += bounce * angularVelocity.Y;
|
||||
|
||||
} // else vertical attractor is off
|
||||
|
||||
// m_lastVertAttractor = vertattr;
|
||||
|
||||
// Bank section tba
|
||||
// Deflection section tba
|
||||
|
||||
// Sum velocities
|
||||
m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection
|
||||
|
||||
if (!m_lastAngularVelocity.ApproxEquals(Vector3.Zero, 0.01f))
|
||||
{
|
||||
if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lastAngularVelocity = Vector3.Zero; // Reduce small value to zero.
|
||||
}
|
||||
|
||||
// apply friction
|
||||
Vector3 decayamount = Vector3.One / (m_angularFrictionTimescale / pTimestep);
|
||||
m_lastAngularVelocity -= m_lastAngularVelocity * decayamount;
|
||||
|
||||
// Apply to the body
|
||||
d.BodySetAngularVel (Body, m_lastAngularVelocity.X, m_lastAngularVelocity.Y, m_lastAngularVelocity.Z);
|
||||
|
||||
} //end MoveAngular
|
||||
}
|
||||
m_lastAngularVelocity -= m_lastAngularVelocity * decayamount;
|
||||
|
||||
// Apply to the body
|
||||
d.BodySetAngularVel (Body, m_lastAngularVelocity.X, m_lastAngularVelocity.Y, m_lastAngularVelocity.Z);
|
||||
|
||||
} //end MoveAngular
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
/* Copyright (c) Contributors, http://opensimulator.org/
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
|
@ -93,7 +95,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
private float m_targetHoverHeight;
|
||||
private float m_groundHeight;
|
||||
private float m_waterHeight;
|
||||
private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
|
||||
private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
|
||||
|
||||
// private float m_tensor = 5f;
|
||||
private int body_autodisable_frames = 20;
|
||||
|
@ -294,7 +296,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_taintselected = value;
|
||||
m_isSelected = value;
|
||||
}
|
||||
if(m_isSelected) disableBodySoft();
|
||||
if (m_isSelected) disableBodySoft();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -302,7 +304,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
prev_geom = prim_geom;
|
||||
prim_geom = geom;
|
||||
//Console.WriteLine("SetGeom to " + prim_geom + " for " + m_primName);
|
||||
//Console.WriteLine("SetGeom to " + prim_geom + " for " + m_primName);
|
||||
if (prim_geom != IntPtr.Zero)
|
||||
{
|
||||
d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
|
||||
|
@ -314,7 +316,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
if (_parent != null && _parent is OdePrim)
|
||||
{
|
||||
OdePrim parent = (OdePrim)_parent;
|
||||
//Console.WriteLine("SetGeom calls ChildSetGeom");
|
||||
//Console.WriteLine("SetGeom calls ChildSetGeom");
|
||||
parent.ChildSetGeom(this);
|
||||
}
|
||||
}
|
||||
|
@ -331,7 +333,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
d.BodyEnable(Body);
|
||||
if (m_vehicle.Type != Vehicle.TYPE_NONE)
|
||||
m_vehicle.Enable(Body, _parent_scene);
|
||||
m_vehicle.Enable(Body, _parent_scene);
|
||||
}
|
||||
|
||||
m_disabled = false;
|
||||
|
@ -376,7 +378,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
|
||||
|
||||
// disconnect from world gravity so we can apply buoyancy
|
||||
d.BodySetGravityMode (Body, false);
|
||||
d.BodySetGravityMode (Body, false);
|
||||
|
||||
m_interpenetrationcount = 0;
|
||||
m_collisionscore = 0;
|
||||
|
@ -872,7 +874,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
public void ProcessTaints(float timestep)
|
||||
{
|
||||
//Console.WriteLine("ProcessTaints for " + m_primName );
|
||||
//Console.WriteLine("ProcessTaints for " + m_primName);
|
||||
if (m_taintadd)
|
||||
{
|
||||
changeadd(timestep);
|
||||
|
@ -880,24 +882,24 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
if (prim_geom != IntPtr.Zero)
|
||||
{
|
||||
if (!_position.ApproxEquals(m_taintposition, 0f))
|
||||
changemove(timestep);
|
||||
if (!_position.ApproxEquals(m_taintposition, 0f))
|
||||
changemove(timestep);
|
||||
|
||||
if (m_taintrot != _orientation)
|
||||
{
|
||||
if(childPrim && IsPhysical) // For physical child prim...
|
||||
{
|
||||
rotate(timestep);
|
||||
// KF: ODE will also rotate the parent prim!
|
||||
// so rotate the root back to where it was
|
||||
OdePrim parent = (OdePrim)_parent;
|
||||
parent.rotate(timestep);
|
||||
if (m_taintrot != _orientation)
|
||||
{
|
||||
if (childPrim && IsPhysical) // For physical child prim...
|
||||
{
|
||||
rotate(timestep);
|
||||
// KF: ODE will also rotate the parent prim!
|
||||
// so rotate the root back to where it was
|
||||
OdePrim parent = (OdePrim)_parent;
|
||||
parent.rotate(timestep);
|
||||
}
|
||||
else
|
||||
{
|
||||
//Just rotate the prim
|
||||
rotate(timestep);
|
||||
}
|
||||
//Just rotate the prim
|
||||
rotate(timestep);
|
||||
}
|
||||
}
|
||||
//
|
||||
|
||||
|
@ -1006,7 +1008,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// destroy link
|
||||
else if (_parent != null && m_taintparent == null)
|
||||
{
|
||||
//Console.WriteLine(" changelink B");
|
||||
//Console.WriteLine(" changelink B");
|
||||
|
||||
if (_parent is OdePrim)
|
||||
{
|
||||
|
@ -1033,7 +1035,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
// prim is the child
|
||||
public void ParentPrim(OdePrim prim)
|
||||
{
|
||||
//Console.WriteLine("ParentPrim " + m_primName);
|
||||
//Console.WriteLine("ParentPrim " + m_primName);
|
||||
if (this.m_localID != prim.m_localID)
|
||||
{
|
||||
if (Body == IntPtr.Zero)
|
||||
|
@ -1047,7 +1049,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
if (!childrenPrim.Contains(prim))
|
||||
{
|
||||
//Console.WriteLine("childrenPrim.Add " + prim);
|
||||
//Console.WriteLine("childrenPrim.Add " + prim);
|
||||
childrenPrim.Add(prim);
|
||||
|
||||
foreach (OdePrim prm in childrenPrim)
|
||||
|
@ -1080,7 +1082,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_log.Warn("[PHYSICS]: Unable to link one of the linkset elements. No geom yet");
|
||||
continue;
|
||||
}
|
||||
//Console.WriteLine(" GeomSetCategoryBits 1: " + prm.prim_geom + " - " + (int)prm.m_collisionCategories + " for " + m_primName);
|
||||
//Console.WriteLine(" GeomSetCategoryBits 1: " + prm.prim_geom + " - " + (int)prm.m_collisionCategories + " for " + m_primName);
|
||||
d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
|
||||
d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
|
||||
|
||||
|
@ -1128,7 +1130,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_collisionCategories |= CollisionCategories.Body;
|
||||
m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
|
||||
|
||||
//Console.WriteLine("GeomSetCategoryBits 2: " + prim_geom + " - " + (int)m_collisionCategories + " for " + m_primName);
|
||||
//Console.WriteLine("GeomSetCategoryBits 2: " + prim_geom + " - " + (int)m_collisionCategories + " for " + m_primName);
|
||||
d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
|
||||
//Console.WriteLine(" Post GeomSetCategoryBits 2");
|
||||
d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
|
||||
|
@ -1203,7 +1205,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
foreach (OdePrim prm in childrenPrim)
|
||||
{
|
||||
//Console.WriteLine("ChildSetGeom calls ParentPrim");
|
||||
//Console.WriteLine("ChildSetGeom calls ParentPrim");
|
||||
ParentPrim(prm);
|
||||
}
|
||||
}
|
||||
|
@ -1230,7 +1232,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
lock (childrenPrim)
|
||||
{
|
||||
//Console.WriteLine("childrenPrim.Remove " + odePrim);
|
||||
//Console.WriteLine("childrenPrim.Remove " + odePrim);
|
||||
childrenPrim.Remove(odePrim);
|
||||
}
|
||||
|
||||
|
@ -1248,7 +1250,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
foreach (OdePrim prm in childrenPrim)
|
||||
{
|
||||
//Console.WriteLine("ChildDelink calls ParentPrim");
|
||||
//Console.WriteLine("ChildDelink calls ParentPrim");
|
||||
ParentPrim(prm);
|
||||
}
|
||||
}
|
||||
|
@ -1350,7 +1352,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
|
||||
{
|
||||
//Console.WriteLine("CreateGeom:");
|
||||
//Console.WriteLine("CreateGeom:");
|
||||
if (_mesh != null)
|
||||
{
|
||||
setMesh(_parent_scene, _mesh);
|
||||
|
@ -1381,7 +1383,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
_parent_scene.waitForSpaceUnlock(m_targetSpace);
|
||||
try
|
||||
{
|
||||
//Console.WriteLine(" CreateGeom 2");
|
||||
//Console.WriteLine(" CreateGeom 2");
|
||||
SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
|
||||
}
|
||||
catch (AccessViolationException)
|
||||
|
@ -1397,7 +1399,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
_parent_scene.waitForSpaceUnlock(m_targetSpace);
|
||||
try
|
||||
{
|
||||
//Console.WriteLine(" CreateGeom 3");
|
||||
//Console.WriteLine(" CreateGeom 3");
|
||||
SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
|
||||
}
|
||||
catch (AccessViolationException)
|
||||
|
@ -1414,7 +1416,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
_parent_scene.waitForSpaceUnlock(m_targetSpace);
|
||||
try
|
||||
{
|
||||
//Console.WriteLine(" CreateGeom 4");
|
||||
//Console.WriteLine(" CreateGeom 4");
|
||||
SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
|
||||
}
|
||||
catch (AccessViolationException)
|
||||
|
@ -1451,7 +1453,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
lock (_parent_scene.OdeLock)
|
||||
{
|
||||
//Console.WriteLine("changeadd 1");
|
||||
//Console.WriteLine("changeadd 1");
|
||||
CreateGeom(m_targetSpace, _mesh);
|
||||
|
||||
if (prim_geom != IntPtr.Zero)
|
||||
|
@ -1508,7 +1510,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
if (Body != (IntPtr)0 && odParent.Body != (IntPtr)0 && Body != odParent.Body)
|
||||
{
|
||||
// KF: Fixed Joints were removed? Anyway - this Console.WriteLine does not show up, so routine is not used??
|
||||
Console.WriteLine(" JointCreateFixed");
|
||||
Console.WriteLine(" JointCreateFixed");
|
||||
m_linkJoint = d.JointCreateFixed(_parent_scene.world, _linkJointGroup);
|
||||
d.JointAttach(m_linkJoint, Body, odParent.Body);
|
||||
d.JointSetFixed(m_linkJoint);
|
||||
|
@ -1562,244 +1564,244 @@ Console.WriteLine(" JointCreateFixed");
|
|||
float fz = 0;
|
||||
|
||||
|
||||
if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims.
|
||||
if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims.
|
||||
{
|
||||
if (m_vehicle.Type != Vehicle.TYPE_NONE)
|
||||
{
|
||||
// 'VEHICLES' are dealt with in ODEDynamics.cs
|
||||
m_vehicle.Step(timestep, _parent_scene);
|
||||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("Move " + m_primName);
|
||||
if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
|
||||
// NON-'VEHICLES' are dealt with here
|
||||
if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
|
||||
{
|
||||
d.Vector3 avel2 = d.BodyGetAngularVel(Body);
|
||||
if (m_angularlock.X == 1)
|
||||
avel2.X = 0;
|
||||
if (m_angularlock.Y == 1)
|
||||
avel2.Y = 0;
|
||||
if (m_angularlock.Z == 1)
|
||||
avel2.Z = 0;
|
||||
d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
|
||||
}
|
||||
//float PID_P = 900.0f;
|
||||
if (m_vehicle.Type != Vehicle.TYPE_NONE)
|
||||
{
|
||||
// 'VEHICLES' are dealt with in ODEDynamics.cs
|
||||
m_vehicle.Step(timestep, _parent_scene);
|
||||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("Move " + m_primName);
|
||||
if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
|
||||
// NON-'VEHICLES' are dealt with here
|
||||
if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
|
||||
{
|
||||
d.Vector3 avel2 = d.BodyGetAngularVel(Body);
|
||||
if (m_angularlock.X == 1)
|
||||
avel2.X = 0;
|
||||
if (m_angularlock.Y == 1)
|
||||
avel2.Y = 0;
|
||||
if (m_angularlock.Z == 1)
|
||||
avel2.Z = 0;
|
||||
d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
|
||||
}
|
||||
//float PID_P = 900.0f;
|
||||
|
||||
float m_mass = CalculateMass();
|
||||
float m_mass = CalculateMass();
|
||||
|
||||
// fz = 0f;
|
||||
// fz = 0f;
|
||||
//m_log.Info(m_collisionFlags.ToString());
|
||||
|
||||
|
||||
//KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
|
||||
// would come from SceneObjectPart.cs, public void SetBuoyancy(float fvalue) , PhysActor.Buoyancy = fvalue; ??
|
||||
// m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up
|
||||
// gravityz multiplier = 1 - m_buoyancy
|
||||
fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass;
|
||||
|
||||
//KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
|
||||
// would come from SceneObjectPart.cs, public void SetBuoyancy(float fvalue) , PhysActor.Buoyancy = fvalue; ??
|
||||
// m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up
|
||||
// gravityz multiplier = 1 - m_buoyancy
|
||||
fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass;
|
||||
|
||||
if (m_usePID)
|
||||
{
|
||||
//Console.WriteLine("PID " + m_primName);
|
||||
// KF - this is for object move? eg. llSetPos() ?
|
||||
//if (!d.BodyIsEnabled(Body))
|
||||
//d.BodySetForce(Body, 0f, 0f, 0f);
|
||||
// If we're using the PID controller, then we have no gravity
|
||||
//fz = (-1 * _parent_scene.gravityz) * m_mass; //KF: ?? Prims have no global gravity,so simply...
|
||||
fz = 0f;
|
||||
if (m_usePID)
|
||||
{
|
||||
//Console.WriteLine("PID " + m_primName);
|
||||
// KF - this is for object move? eg. llSetPos() ?
|
||||
//if (!d.BodyIsEnabled(Body))
|
||||
//d.BodySetForce(Body, 0f, 0f, 0f);
|
||||
// If we're using the PID controller, then we have no gravity
|
||||
//fz = (-1 * _parent_scene.gravityz) * m_mass; //KF: ?? Prims have no global gravity,so simply...
|
||||
fz = 0f;
|
||||
|
||||
// no lock; for now it's only called from within Simulate()
|
||||
|
||||
// If the PID Controller isn't active then we set our force
|
||||
// calculating base velocity to the current position
|
||||
// no lock; for now it's only called from within Simulate()
|
||||
|
||||
// If the PID Controller isn't active then we set our force
|
||||
// calculating base velocity to the current position
|
||||
|
||||
if ((m_PIDTau < 1) && (m_PIDTau != 0))
|
||||
{
|
||||
//PID_G = PID_G / m_PIDTau;
|
||||
m_PIDTau = 1;
|
||||
}
|
||||
|
||||
if ((PID_G - m_PIDTau) <= 0)
|
||||
{
|
||||
PID_G = m_PIDTau + 1;
|
||||
}
|
||||
//PidStatus = true;
|
||||
if ((m_PIDTau < 1) && (m_PIDTau != 0))
|
||||
{
|
||||
//PID_G = PID_G / m_PIDTau;
|
||||
m_PIDTau = 1;
|
||||
}
|
||||
|
||||
if ((PID_G - m_PIDTau) <= 0)
|
||||
{
|
||||
PID_G = m_PIDTau + 1;
|
||||
}
|
||||
//PidStatus = true;
|
||||
|
||||
// PhysicsVector vec = new PhysicsVector();
|
||||
d.Vector3 vel = d.BodyGetLinearVel(Body);
|
||||
// PhysicsVector vec = new PhysicsVector();
|
||||
d.Vector3 vel = d.BodyGetLinearVel(Body);
|
||||
|
||||
d.Vector3 pos = d.BodyGetPosition(Body);
|
||||
_target_velocity =
|
||||
d.Vector3 pos = d.BodyGetPosition(Body);
|
||||
_target_velocity =
|
||||
new Vector3(
|
||||
(m_PIDTarget.X - pos.X) * ((PID_G - m_PIDTau) * timestep),
|
||||
(m_PIDTarget.Y - pos.Y) * ((PID_G - m_PIDTau) * timestep),
|
||||
(m_PIDTarget.Z - pos.Z) * ((PID_G - m_PIDTau) * timestep)
|
||||
);
|
||||
(m_PIDTarget.X - pos.X) * ((PID_G - m_PIDTau) * timestep),
|
||||
(m_PIDTarget.Y - pos.Y) * ((PID_G - m_PIDTau) * timestep),
|
||||
(m_PIDTarget.Z - pos.Z) * ((PID_G - m_PIDTau) * timestep)
|
||||
);
|
||||
|
||||
// if velocity is zero, use position control; otherwise, velocity control
|
||||
// if velocity is zero, use position control; otherwise, velocity control
|
||||
|
||||
if (_target_velocity.ApproxEquals(Vector3.Zero,0.1f))
|
||||
{
|
||||
// keep track of where we stopped. No more slippin' & slidin'
|
||||
|
||||
// We only want to deactivate the PID Controller if we think we want to have our surrogate
|
||||
// react to the physics scene by moving it's position.
|
||||
// Avatar to Avatar collisions
|
||||
// Prim to avatar collisions
|
||||
if (_target_velocity.ApproxEquals(Vector3.Zero,0.1f))
|
||||
{
|
||||
// keep track of where we stopped. No more slippin' & slidin'
|
||||
|
||||
// We only want to deactivate the PID Controller if we think we want to have our surrogate
|
||||
// react to the physics scene by moving it's position.
|
||||
// Avatar to Avatar collisions
|
||||
// Prim to avatar collisions
|
||||
|
||||
//fx = (_target_velocity.X - vel.X) * (PID_D) + (_zeroPosition.X - pos.X) * (PID_P * 2);
|
||||
//fy = (_target_velocity.Y - vel.Y) * (PID_D) + (_zeroPosition.Y - pos.Y) * (PID_P * 2);
|
||||
//fz = fz + (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
|
||||
d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);
|
||||
d.BodySetLinearVel(Body, 0, 0, 0);
|
||||
d.BodyAddForce(Body, 0, 0, fz);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
_zeroFlag = false;
|
||||
//fx = (_target_velocity.X - vel.X) * (PID_D) + (_zeroPosition.X - pos.X) * (PID_P * 2);
|
||||
//fy = (_target_velocity.Y - vel.Y) * (PID_D) + (_zeroPosition.Y - pos.Y) * (PID_P * 2);
|
||||
//fz = fz + (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
|
||||
d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);
|
||||
d.BodySetLinearVel(Body, 0, 0, 0);
|
||||
d.BodyAddForce(Body, 0, 0, fz);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
_zeroFlag = false;
|
||||
|
||||
// We're flying and colliding with something
|
||||
fx = ((_target_velocity.X) - vel.X) * (PID_D);
|
||||
fy = ((_target_velocity.Y) - vel.Y) * (PID_D);
|
||||
|
||||
// vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P;
|
||||
// We're flying and colliding with something
|
||||
fx = ((_target_velocity.X) - vel.X) * (PID_D);
|
||||
fy = ((_target_velocity.Y) - vel.Y) * (PID_D);
|
||||
|
||||
// vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P;
|
||||
|
||||
fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
|
||||
}
|
||||
} // end if (m_usePID)
|
||||
fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
|
||||
}
|
||||
} // end if (m_usePID)
|
||||
|
||||
// Hover PID Controller needs to be mutually exlusive to MoveTo PID controller
|
||||
if (m_useHoverPID && !m_usePID)
|
||||
{
|
||||
//Console.WriteLine("Hover " + m_primName);
|
||||
|
||||
// If we're using the PID controller, then we have no gravity
|
||||
fz = (-1 * _parent_scene.gravityz) * m_mass;
|
||||
// Hover PID Controller needs to be mutually exlusive to MoveTo PID controller
|
||||
if (m_useHoverPID && !m_usePID)
|
||||
{
|
||||
//Console.WriteLine("Hover " + m_primName);
|
||||
|
||||
// If we're using the PID controller, then we have no gravity
|
||||
fz = (-1 * _parent_scene.gravityz) * m_mass;
|
||||
|
||||
// no lock; for now it's only called from within Simulate()
|
||||
// no lock; for now it's only called from within Simulate()
|
||||
|
||||
// If the PID Controller isn't active then we set our force
|
||||
// calculating base velocity to the current position
|
||||
// If the PID Controller isn't active then we set our force
|
||||
// calculating base velocity to the current position
|
||||
|
||||
if ((m_PIDTau < 1))
|
||||
{
|
||||
PID_G = PID_G / m_PIDTau;
|
||||
}
|
||||
if ((m_PIDTau < 1))
|
||||
{
|
||||
PID_G = PID_G / m_PIDTau;
|
||||
}
|
||||
|
||||
if ((PID_G - m_PIDTau) <= 0)
|
||||
{
|
||||
PID_G = m_PIDTau + 1;
|
||||
}
|
||||
if ((PID_G - m_PIDTau) <= 0)
|
||||
{
|
||||
PID_G = m_PIDTau + 1;
|
||||
}
|
||||
|
||||
|
||||
// Where are we, and where are we headed?
|
||||
d.Vector3 pos = d.BodyGetPosition(Body);
|
||||
d.Vector3 vel = d.BodyGetLinearVel(Body);
|
||||
// Where are we, and where are we headed?
|
||||
d.Vector3 pos = d.BodyGetPosition(Body);
|
||||
d.Vector3 vel = d.BodyGetLinearVel(Body);
|
||||
|
||||
|
||||
// Non-Vehicles have a limited set of Hover options.
|
||||
// determine what our target height really is based on HoverType
|
||||
switch (m_PIDHoverType)
|
||||
{
|
||||
case PIDHoverType.Ground:
|
||||
m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
|
||||
m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
|
||||
break;
|
||||
case PIDHoverType.GroundAndWater:
|
||||
m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
|
||||
m_waterHeight = _parent_scene.GetWaterLevel();
|
||||
if (m_groundHeight > m_waterHeight)
|
||||
{
|
||||
m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_targetHoverHeight = m_waterHeight + m_PIDHoverHeight;
|
||||
}
|
||||
break;
|
||||
// Non-Vehicles have a limited set of Hover options.
|
||||
// determine what our target height really is based on HoverType
|
||||
switch (m_PIDHoverType)
|
||||
{
|
||||
case PIDHoverType.Ground:
|
||||
m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
|
||||
m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
|
||||
break;
|
||||
case PIDHoverType.GroundAndWater:
|
||||
m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
|
||||
m_waterHeight = _parent_scene.GetWaterLevel();
|
||||
if (m_groundHeight > m_waterHeight)
|
||||
{
|
||||
m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_targetHoverHeight = m_waterHeight + m_PIDHoverHeight;
|
||||
}
|
||||
break;
|
||||
|
||||
} // end switch (m_PIDHoverType)
|
||||
} // end switch (m_PIDHoverType)
|
||||
|
||||
|
||||
_target_velocity =
|
||||
_target_velocity =
|
||||
new Vector3(0.0f, 0.0f,
|
||||
(m_targetHoverHeight - pos.Z) * ((PID_G - m_PIDHoverTau) * timestep)
|
||||
);
|
||||
(m_targetHoverHeight - pos.Z) * ((PID_G - m_PIDHoverTau) * timestep)
|
||||
);
|
||||
|
||||
// if velocity is zero, use position control; otherwise, velocity control
|
||||
// if velocity is zero, use position control; otherwise, velocity control
|
||||
|
||||
if (_target_velocity.ApproxEquals(Vector3.Zero, 0.1f))
|
||||
{
|
||||
// keep track of where we stopped. No more slippin' & slidin'
|
||||
|
||||
// We only want to deactivate the PID Controller if we think we want to have our surrogate
|
||||
// react to the physics scene by moving it's position.
|
||||
// Avatar to Avatar collisions
|
||||
// Prim to avatar collisions
|
||||
if (_target_velocity.ApproxEquals(Vector3.Zero, 0.1f))
|
||||
{
|
||||
// keep track of where we stopped. No more slippin' & slidin'
|
||||
|
||||
// We only want to deactivate the PID Controller if we think we want to have our surrogate
|
||||
// react to the physics scene by moving it's position.
|
||||
// Avatar to Avatar collisions
|
||||
// Prim to avatar collisions
|
||||
|
||||
d.BodySetPosition(Body, pos.X, pos.Y, m_targetHoverHeight);
|
||||
d.BodySetLinearVel(Body, vel.X, vel.Y, 0);
|
||||
d.BodyAddForce(Body, 0, 0, fz);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
_zeroFlag = false;
|
||||
d.BodySetPosition(Body, pos.X, pos.Y, m_targetHoverHeight);
|
||||
d.BodySetLinearVel(Body, vel.X, vel.Y, 0);
|
||||
d.BodyAddForce(Body, 0, 0, fz);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
_zeroFlag = false;
|
||||
|
||||
// We're flying and colliding with something
|
||||
fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
|
||||
}
|
||||
}
|
||||
// We're flying and colliding with something
|
||||
fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
|
||||
}
|
||||
}
|
||||
|
||||
fx *= m_mass;
|
||||
fy *= m_mass;
|
||||
//fz *= m_mass;
|
||||
fx *= m_mass;
|
||||
fy *= m_mass;
|
||||
//fz *= m_mass;
|
||||
|
||||
fx += m_force.X;
|
||||
fy += m_force.Y;
|
||||
fz += m_force.Z;
|
||||
fx += m_force.X;
|
||||
fy += m_force.Y;
|
||||
fz += m_force.Z;
|
||||
|
||||
//m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());
|
||||
if (fx != 0 || fy != 0 || fz != 0)
|
||||
{
|
||||
//m_taintdisable = true;
|
||||
//base.RaiseOutOfBounds(Position);
|
||||
//d.BodySetLinearVel(Body, fx, fy, 0f);
|
||||
if (!d.BodyIsEnabled(Body))
|
||||
{
|
||||
// A physical body at rest on a surface will auto-disable after a while,
|
||||
// this appears to re-enable it incase the surface it is upon vanishes,
|
||||
// and the body should fall again.
|
||||
d.BodySetLinearVel(Body, 0f, 0f, 0f);
|
||||
d.BodySetForce(Body, 0, 0, 0);
|
||||
enableBodySoft();
|
||||
}
|
||||
//m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());
|
||||
if (fx != 0 || fy != 0 || fz != 0)
|
||||
{
|
||||
//m_taintdisable = true;
|
||||
//base.RaiseOutOfBounds(Position);
|
||||
//d.BodySetLinearVel(Body, fx, fy, 0f);
|
||||
if (!d.BodyIsEnabled(Body))
|
||||
{
|
||||
// A physical body at rest on a surface will auto-disable after a while,
|
||||
// this appears to re-enable it incase the surface it is upon vanishes,
|
||||
// and the body should fall again.
|
||||
d.BodySetLinearVel(Body, 0f, 0f, 0f);
|
||||
d.BodySetForce(Body, 0, 0, 0);
|
||||
enableBodySoft();
|
||||
}
|
||||
|
||||
// 35x10 = 350n times the mass per second applied maximum.
|
||||
float nmax = 35f * m_mass;
|
||||
float nmin = -35f * m_mass;
|
||||
// 35x10 = 350n times the mass per second applied maximum.
|
||||
float nmax = 35f * m_mass;
|
||||
float nmin = -35f * m_mass;
|
||||
|
||||
|
||||
if (fx > nmax)
|
||||
fx = nmax;
|
||||
if (fx < nmin)
|
||||
fx = nmin;
|
||||
if (fy > nmax)
|
||||
fy = nmax;
|
||||
if (fy < nmin)
|
||||
fy = nmin;
|
||||
d.BodyAddForce(Body, fx, fy, fz);
|
||||
//Console.WriteLine("AddForce " + fx + "," + fy + "," + fz);
|
||||
}
|
||||
}
|
||||
if (fx > nmax)
|
||||
fx = nmax;
|
||||
if (fx < nmin)
|
||||
fx = nmin;
|
||||
if (fy > nmax)
|
||||
fy = nmax;
|
||||
if (fy < nmin)
|
||||
fy = nmin;
|
||||
d.BodyAddForce(Body, fx, fy, fz);
|
||||
//Console.WriteLine("AddForce " + fx + "," + fy + "," + fz);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // is not physical, or is not a body or is selected
|
||||
{ // is not physical, or is not a body or is selected
|
||||
// _zeroPosition = d.BodyGetPosition(Body);
|
||||
return;
|
||||
//Console.WriteLine("Nothing " + m_primName);
|
||||
//Console.WriteLine("Nothing " + m_primName);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1815,18 +1817,18 @@ Console.WriteLine(" JointCreateFixed");
|
|||
myrot.W = _orientation.W;
|
||||
if (Body != IntPtr.Zero)
|
||||
{
|
||||
// KF: If this is a root prim do BodySet
|
||||
// KF: If this is a root prim do BodySet
|
||||
d.BodySetQuaternion(Body, ref myrot);
|
||||
if (m_isphysical)
|
||||
{
|
||||
if (m_isphysical)
|
||||
{
|
||||
if (!m_angularlock.ApproxEquals(Vector3.One, 0f))
|
||||
createAMotor(m_angularlock);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// daughter prim, do Geom set
|
||||
d.GeomSetQuaternion(prim_geom, ref myrot);
|
||||
createAMotor(m_angularlock);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// daughter prim, do Geom set
|
||||
d.GeomSetQuaternion(prim_geom, ref myrot);
|
||||
}
|
||||
|
||||
resetCollisionAccounting();
|
||||
|
@ -1890,7 +1892,7 @@ Console.WriteLine(" JointCreateFixed");
|
|||
m_log.Error("[PHYSICS]: PrimGeom dead");
|
||||
}
|
||||
}
|
||||
//Console.WriteLine("changePhysicsStatus for " + m_primName );
|
||||
//Console.WriteLine("changePhysicsStatus for " + m_primName);
|
||||
changeadd(2f);
|
||||
}
|
||||
if (childPrim)
|
||||
|
@ -1976,7 +1978,7 @@ Console.WriteLine(" JointCreateFixed");
|
|||
else
|
||||
{
|
||||
_mesh = null;
|
||||
//Console.WriteLine("changesize 2");
|
||||
//Console.WriteLine("changesize 2");
|
||||
CreateGeom(m_targetSpace, _mesh);
|
||||
}
|
||||
|
||||
|
@ -2083,7 +2085,7 @@ Console.WriteLine(" JointCreateFixed");
|
|||
else
|
||||
{
|
||||
_mesh = null;
|
||||
//Console.WriteLine("changeshape");
|
||||
//Console.WriteLine("changeshape");
|
||||
CreateGeom(m_targetSpace, null);
|
||||
}
|
||||
|
||||
|
@ -2454,7 +2456,7 @@ Console.WriteLine(" JointCreateFixed");
|
|||
if (QuaternionIsFinite(value))
|
||||
{
|
||||
_orientation = value;
|
||||
}
|
||||
}
|
||||
else
|
||||
m_log.Warn("[PHYSICS]: Got NaN quaternion Orientation from Scene in Object");
|
||||
|
||||
|
@ -2675,8 +2677,8 @@ Console.WriteLine(" JointCreateFixed");
|
|||
//outofBounds = true;
|
||||
}
|
||||
|
||||
//float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation));
|
||||
//Console.WriteLine("Adiff " + m_primName + " = " + Adiff);
|
||||
//float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation));
|
||||
//Console.WriteLine("Adiff " + m_primName + " = " + Adiff);
|
||||
if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
|
||||
&& (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)
|
||||
&& (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02)
|
||||
|
@ -2684,7 +2686,7 @@ Console.WriteLine(" JointCreateFixed");
|
|||
&& (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.0001)) // KF 0.01 is far to large
|
||||
{
|
||||
_zeroFlag = true;
|
||||
//Console.WriteLine("ZFT 2");
|
||||
//Console.WriteLine("ZFT 2");
|
||||
m_throttleUpdates = false;
|
||||
}
|
||||
else
|
||||
|
|
|
@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
for (int i = 0; i < reqs.Length; i++)
|
||||
{
|
||||
if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast
|
||||
RayCast(reqs[i]); // if there isn't anyone to send results
|
||||
RayCast(reqs[i]); // if there isn't anyone to send results
|
||||
}
|
||||
/*
|
||||
foreach (ODERayCastRequest req in m_PendingRequests)
|
||||
|
|
|
@ -2152,7 +2152,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
/// <param name="prim"></param>
|
||||
public void RemovePrimThreadLocked(OdePrim prim)
|
||||
{
|
||||
//Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName);
|
||||
//Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName);
|
||||
lock (prim)
|
||||
{
|
||||
remCollisionEventReporting(prim);
|
||||
|
@ -2603,12 +2603,12 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
lock (_taintedPrimLock)
|
||||
{
|
||||
if (!(_taintedPrimH.Contains(taintedprim)))
|
||||
{
|
||||
//Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.m_primName);
|
||||
_taintedPrimH.Add(taintedprim); // HashSet for searching
|
||||
_taintedPrimL.Add(taintedprim); // List for ordered readout
|
||||
}
|
||||
}
|
||||
{
|
||||
//Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.m_primName);
|
||||
_taintedPrimH.Add(taintedprim); // HashSet for searching
|
||||
_taintedPrimL.Add(taintedprim); // List for ordered readout
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
else if (prim is OdeCharacter)
|
||||
|
@ -2736,12 +2736,12 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
if (prim.m_taintremove)
|
||||
{
|
||||
//Console.WriteLine("Simulate calls RemovePrimThreadLocked");
|
||||
//Console.WriteLine("Simulate calls RemovePrimThreadLocked");
|
||||
RemovePrimThreadLocked(prim);
|
||||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("Simulate calls ProcessTaints");
|
||||
//Console.WriteLine("Simulate calls ProcessTaints");
|
||||
prim.ProcessTaints(timeStep);
|
||||
}
|
||||
processedtaints = true;
|
||||
|
@ -2937,7 +2937,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
}
|
||||
|
||||
if (processedtaints)
|
||||
//Console.WriteLine("Simulate calls Clear of _taintedPrim list");
|
||||
//Console.WriteLine("Simulate calls Clear of _taintedPrim list");
|
||||
_taintedPrimH.Clear();
|
||||
_taintedPrimL.Clear();
|
||||
}
|
||||
|
|
|
@ -2753,7 +2753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
{
|
||||
m_host.AddScriptLPS(1);
|
||||
m_host.CollisionFilter.Clear();
|
||||
if(id != null)
|
||||
if (id != null)
|
||||
{
|
||||
m_host.CollisionFilter.Add(accept,id);
|
||||
}
|
||||
|
@ -3818,6 +3818,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
Util.Clip((float)color.z, 0.0f, 1.0f));
|
||||
m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
|
||||
m_host.ParentGroup.HasGroupChanged = true;
|
||||
m_host.ParentGroup.ScheduleGroupForFullUpdate();
|
||||
}
|
||||
|
||||
public LSL_Float llWater(LSL_Vector offset)
|
||||
|
@ -4240,7 +4241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
public void llPassCollisions(int pass)
|
||||
{
|
||||
m_host.AddScriptLPS(1);
|
||||
if(pass == 0)
|
||||
if (pass == 0)
|
||||
{
|
||||
m_host.ParentGroup.PassCollision = false;
|
||||
}
|
||||
|
@ -7437,7 +7438,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
// makes it more difficult to determine a child prim's actual inworld position).
|
||||
if (part.ParentID != 0)
|
||||
v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
|
||||
res.Add( v );
|
||||
res.Add(v);
|
||||
break;
|
||||
|
||||
case (int)ScriptBaseClass.PRIM_SIZE:
|
||||
|
|
|
@ -1948,7 +1948,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
|
||||
return key.ToString();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Return information regarding various simulator statistics (sim fps, physics fps, time
|
||||
/// dilation, total number of prims, total number of active scripts, script lps, various
|
||||
|
@ -1956,19 +1956,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
/// client's Statistics Bar (Ctrl-Shift-1)
|
||||
/// </summary>
|
||||
/// <returns>List of floats</returns>
|
||||
public LSL_List osGetRegionStats()
|
||||
{
|
||||
public LSL_List osGetRegionStats()
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
|
||||
m_host.AddScriptLPS(1);
|
||||
LSL_List ret = new LSL_List();
|
||||
float[] stats = World.SimulatorStats;
|
||||
|
||||
for (int i = 0; i < 21; i++)
|
||||
{
|
||||
ret.Add(new LSL_Float( stats[i] ));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
float[] stats = World.SimulatorStats;
|
||||
|
||||
for (int i = 0; i < 21; i++)
|
||||
{
|
||||
ret.Add(new LSL_Float(stats[i]));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
public int osGetSimulatorMemory()
|
||||
{
|
||||
|
@ -1984,81 +1984,81 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
return (int)pws;
|
||||
}
|
||||
public void osSetSpeed(string UUID, float SpeedModifier)
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
|
||||
m_host.AddScriptLPS(1);
|
||||
ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
|
||||
avatar.SpeedModifier = SpeedModifier;
|
||||
}
|
||||
ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
|
||||
avatar.SpeedModifier = SpeedModifier;
|
||||
}
|
||||
public void osKickAvatar(string FirstName,string SurName,string alert)
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
|
||||
if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
|
||||
if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
|
||||
{
|
||||
foreach (ScenePresence presence in World.GetAvatars())
|
||||
{
|
||||
if ((presence.Firstname == FirstName) &&
|
||||
presence.Lastname == SurName)
|
||||
{
|
||||
// kick client...
|
||||
if (alert != null)
|
||||
presence.ControllingClient.Kick(alert);
|
||||
foreach (ScenePresence presence in World.GetAvatars())
|
||||
{
|
||||
if ((presence.Firstname == FirstName) &&
|
||||
presence.Lastname == SurName)
|
||||
{
|
||||
// kick client...
|
||||
if (alert != null)
|
||||
presence.ControllingClient.Kick(alert);
|
||||
|
||||
// ...and close on our side
|
||||
presence.Scene.IncomingCloseAgent(presence.UUID);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// ...and close on our side
|
||||
presence.Scene.IncomingCloseAgent(presence.UUID);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public void osCauseDamage(string avatar, double damage)
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
|
||||
m_host.AddScriptLPS(1);
|
||||
CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
|
||||
m_host.AddScriptLPS(1);
|
||||
|
||||
UUID avatarId = new UUID(avatar);
|
||||
Vector3 pos = m_host.GetWorldPosition();
|
||||
UUID avatarId = new UUID(avatar);
|
||||
Vector3 pos = m_host.GetWorldPosition();
|
||||
|
||||
ScenePresence presence = World.GetScenePresence(avatarId);
|
||||
if (presence != null)
|
||||
{
|
||||
LandData land = World.GetLandData((float)pos.X, (float)pos.Y);
|
||||
if ((land.Flags & (uint)ParcelFlags.AllowDamage) == (uint)ParcelFlags.AllowDamage)
|
||||
{
|
||||
float health = presence.Health;
|
||||
health -= (float)damage;
|
||||
presence.setHealthWithUpdate(health);
|
||||
if (health <= 0)
|
||||
{
|
||||
float healthliveagain = 100;
|
||||
presence.ControllingClient.SendAgentAlertMessage("You died!", true);
|
||||
presence.setHealthWithUpdate(healthliveagain);
|
||||
presence.Scene.TeleportClientHome(presence.UUID, presence.ControllingClient);
|
||||
}
|
||||
}
|
||||
}
|
||||
ScenePresence presence = World.GetScenePresence(avatarId);
|
||||
if (presence != null)
|
||||
{
|
||||
LandData land = World.GetLandData((float)pos.X, (float)pos.Y);
|
||||
if ((land.Flags & (uint)ParcelFlags.AllowDamage) == (uint)ParcelFlags.AllowDamage)
|
||||
{
|
||||
float health = presence.Health;
|
||||
health -= (float)damage;
|
||||
presence.setHealthWithUpdate(health);
|
||||
if (health <= 0)
|
||||
{
|
||||
float healthliveagain = 100;
|
||||
presence.ControllingClient.SendAgentAlertMessage("You died!", true);
|
||||
presence.setHealthWithUpdate(healthliveagain);
|
||||
presence.Scene.TeleportClientHome(presence.UUID, presence.ControllingClient);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public void osCauseHealing(string avatar, double healing)
|
||||
{
|
||||
CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
|
||||
m_host.AddScriptLPS(1);
|
||||
CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
|
||||
m_host.AddScriptLPS(1);
|
||||
|
||||
UUID avatarId = new UUID(avatar);
|
||||
ScenePresence presence = World.GetScenePresence(avatarId);
|
||||
Vector3 pos = m_host.GetWorldPosition();
|
||||
bool result = World.ScriptDanger(m_host.LocalId, new Vector3((float)pos.X, (float)pos.Y, (float)pos.Z));
|
||||
if (result)
|
||||
{
|
||||
if (presence != null)
|
||||
{
|
||||
float health = presence.Health;
|
||||
health += (float)healing;
|
||||
if (health >= 100)
|
||||
{
|
||||
health = 100;
|
||||
}
|
||||
presence.setHealthWithUpdate(health);
|
||||
}
|
||||
}
|
||||
UUID avatarId = new UUID(avatar);
|
||||
ScenePresence presence = World.GetScenePresence(avatarId);
|
||||
Vector3 pos = m_host.GetWorldPosition();
|
||||
bool result = World.ScriptDanger(m_host.LocalId, new Vector3((float)pos.X, (float)pos.Y, (float)pos.Z));
|
||||
if (result)
|
||||
{
|
||||
if (presence != null)
|
||||
{
|
||||
float health = presence.Health;
|
||||
health += (float)healing;
|
||||
if (health >= 100)
|
||||
{
|
||||
health = 100;
|
||||
}
|
||||
presence.setHealthWithUpdate(health);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -162,7 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
|||
|
||||
key osGetMapTexture();
|
||||
key osGetRegionMapTexture(string regionName);
|
||||
LSL_List osGetRegionStats();
|
||||
LSL_List osGetRegionStats();
|
||||
|
||||
int osGetSimulatorMemory();
|
||||
void osKickAvatar(string FirstName,string SurName,string alert);
|
||||
|
|
|
@ -515,29 +515,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
public const string TEXTURE_PLYWOOD = "89556747-24cb-43ed-920b-47caed15465f";
|
||||
public const string TEXTURE_TRANSPARENT = "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903";
|
||||
public const string TEXTURE_MEDIA = "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361";
|
||||
|
||||
// Constants for osGetRegionStats
|
||||
public const int STATS_TIME_DILATION = 0;
|
||||
public const int STATS_SIM_FPS = 1;
|
||||
public const int STATS_PHYSICS_FPS = 2;
|
||||
public const int STATS_AGENT_UPDATES = 3;
|
||||
public const int STATS_ROOT_AGENTS = 4;
|
||||
public const int STATS_CHILD_AGENTS = 5;
|
||||
public const int STATS_TOTAL_PRIMS = 6;
|
||||
public const int STATS_ACTIVE_PRIMS = 7;
|
||||
public const int STATS_FRAME_MS = 8;
|
||||
public const int STATS_NET_MS = 9;
|
||||
public const int STATS_PHYSICS_MS = 10;
|
||||
public const int STATS_IMAGE_MS = 11;
|
||||
public const int STATS_OTHER_MS = 12;
|
||||
public const int STATS_IN_PACKETS_PER_SECOND = 13;
|
||||
public const int STATS_OUT_PACKETS_PER_SECOND = 14;
|
||||
public const int STATS_UNACKED_BYTES = 15;
|
||||
public const int STATS_AGENT_MS = 16;
|
||||
public const int STATS_PENDING_DOWNLOADS = 17;
|
||||
public const int STATS_PENDING_UPLOADS = 18;
|
||||
public const int STATS_ACTIVE_SCRIPTS = 19;
|
||||
public const int STATS_SCRIPT_LPS = 20;
|
||||
|
||||
// Constants for osGetRegionStats
|
||||
public const int STATS_TIME_DILATION = 0;
|
||||
public const int STATS_SIM_FPS = 1;
|
||||
public const int STATS_PHYSICS_FPS = 2;
|
||||
public const int STATS_AGENT_UPDATES = 3;
|
||||
public const int STATS_ROOT_AGENTS = 4;
|
||||
public const int STATS_CHILD_AGENTS = 5;
|
||||
public const int STATS_TOTAL_PRIMS = 6;
|
||||
public const int STATS_ACTIVE_PRIMS = 7;
|
||||
public const int STATS_FRAME_MS = 8;
|
||||
public const int STATS_NET_MS = 9;
|
||||
public const int STATS_PHYSICS_MS = 10;
|
||||
public const int STATS_IMAGE_MS = 11;
|
||||
public const int STATS_OTHER_MS = 12;
|
||||
public const int STATS_IN_PACKETS_PER_SECOND = 13;
|
||||
public const int STATS_OUT_PACKETS_PER_SECOND = 14;
|
||||
public const int STATS_UNACKED_BYTES = 15;
|
||||
public const int STATS_AGENT_MS = 16;
|
||||
public const int STATS_PENDING_DOWNLOADS = 17;
|
||||
public const int STATS_PENDING_UPLOADS = 18;
|
||||
public const int STATS_ACTIVE_SCRIPTS = 19;
|
||||
public const int STATS_SCRIPT_LPS = 20;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -632,11 +632,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
{
|
||||
return m_OSSL_Functions.osGetRegionMapTexture(regionName);
|
||||
}
|
||||
|
||||
public LSL_List osGetRegionStats()
|
||||
{
|
||||
return m_OSSL_Functions.osGetRegionStats();
|
||||
}
|
||||
|
||||
public LSL_List osGetRegionStats()
|
||||
{
|
||||
return m_OSSL_Functions.osGetRegionStats();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the amount of memory in use by the Simulator Daemon.
|
||||
|
@ -649,7 +649,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
}
|
||||
public void osKickAvatar(string FirstName,string SurName,string alert)
|
||||
{
|
||||
m_OSSL_Functions.osKickAvatar( FirstName, SurName, alert);
|
||||
m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);
|
||||
}
|
||||
public void osSetSpeed(string UUID, float SpeedModifier)
|
||||
{
|
||||
|
|
|
@ -126,6 +126,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
m_InitialValues = GetVars();
|
||||
}
|
||||
|
||||
public virtual void StateChange(string newState)
|
||||
{
|
||||
}
|
||||
|
||||
public void Close()
|
||||
{
|
||||
// m_sponser.Close();
|
||||
|
|
|
@ -591,7 +591,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
|
||||
Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;
|
||||
|
||||
lock(m_ScriptErrors)
|
||||
lock (m_ScriptErrors)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
|
@ -59,6 +59,7 @@ namespace OpenSim.Services.Interfaces
|
|||
/// </summary>
|
||||
/// <param name="userID"></param>
|
||||
/// <returns></returns>
|
||||
[Obsolete]
|
||||
InventoryCollection GetUserInventory(UUID userID);
|
||||
|
||||
/// <summary>
|
||||
|
@ -67,6 +68,7 @@ namespace OpenSim.Services.Interfaces
|
|||
/// </summary>
|
||||
/// <param name="userID"></param>
|
||||
/// <param name="callback"></param>
|
||||
[Obsolete]
|
||||
void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using log4net;
|
||||
|
@ -102,7 +103,17 @@ namespace OpenSim.Services.InventoryService
|
|||
// See IInventoryServices
|
||||
public bool CreateUserInventory(UUID user)
|
||||
{
|
||||
InventoryFolderBase existingRootFolder = GetRootFolder(user);
|
||||
InventoryFolderBase existingRootFolder;
|
||||
try
|
||||
{
|
||||
existingRootFolder = GetRootFolder(user);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// Munch the exception, it has already been reported
|
||||
//
|
||||
return false;
|
||||
}
|
||||
|
||||
if (null != existingRootFolder)
|
||||
{
|
||||
|
|
|
@ -0,0 +1,508 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using OpenMetaverse;
|
||||
using log4net;
|
||||
using Nini.Config;
|
||||
using System.Reflection;
|
||||
using OpenSim.Services.Base;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using OpenSim.Data;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Services.InventoryService
|
||||
{
|
||||
public class XInventoryService : ServiceBase, IInventoryService
|
||||
{
|
||||
private static readonly ILog m_log =
|
||||
LogManager.GetLogger(
|
||||
MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
protected IXInventoryData m_Database;
|
||||
|
||||
public XInventoryService(IConfigSource config) : base(config)
|
||||
{
|
||||
string dllName = String.Empty;
|
||||
string connString = String.Empty;
|
||||
//string realm = "Inventory"; // OSG version doesn't use this
|
||||
|
||||
//
|
||||
// Try reading the [InventoryService] section first, if it exists
|
||||
//
|
||||
IConfig authConfig = config.Configs["InventoryService"];
|
||||
if (authConfig != null)
|
||||
{
|
||||
dllName = authConfig.GetString("StorageProvider", dllName);
|
||||
connString = authConfig.GetString("ConnectionString", connString);
|
||||
// realm = authConfig.GetString("Realm", realm);
|
||||
}
|
||||
|
||||
//
|
||||
// Try reading the [DatabaseService] section, if it exists
|
||||
//
|
||||
IConfig dbConfig = config.Configs["DatabaseService"];
|
||||
if (dbConfig != null)
|
||||
{
|
||||
if (dllName == String.Empty)
|
||||
dllName = dbConfig.GetString("StorageProvider", String.Empty);
|
||||
if (connString == String.Empty)
|
||||
connString = dbConfig.GetString("ConnectionString", String.Empty);
|
||||
}
|
||||
|
||||
//
|
||||
// We tried, but this doesn't exist. We can't proceed.
|
||||
//
|
||||
if (dllName == String.Empty)
|
||||
throw new Exception("No StorageProvider configured");
|
||||
|
||||
m_Database = LoadPlugin<IXInventoryData>(dllName,
|
||||
new Object[] {connString, String.Empty});
|
||||
if (m_Database == null)
|
||||
throw new Exception("Could not find a storage interface in the given module");
|
||||
}
|
||||
|
||||
public bool CreateUserInventory(UUID principalID)
|
||||
{
|
||||
// This is braindeaad. We can't ever communicate that we fixed
|
||||
// an existing inventory. Well, just return root folder status,
|
||||
// but check sanity anyway.
|
||||
//
|
||||
bool result = false;
|
||||
|
||||
InventoryFolderBase rootFolder = GetRootFolder(principalID);
|
||||
|
||||
if (rootFolder == null)
|
||||
{
|
||||
rootFolder = ConvertToOpenSim(CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "My Inventory"));
|
||||
result = true;
|
||||
}
|
||||
|
||||
XInventoryFolder[] sysFolders = GetSystemFolders(principalID);
|
||||
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Animation) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Animation, "Animations");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Bodypart) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Bodypart, "Body Parts");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.CallingCard) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.CallingCard, "Calling Cards");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Clothing) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Clothing, "Clothing");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Gesture) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Gesture, "Gestures");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Landmark) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Landmark, "Landmarks");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.LostAndFoundFolder) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.LostAndFoundFolder, "Lost And Found");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Notecard) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Notecard, "Notecards");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Object) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Object, "Objects");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.SnapshotFolder) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.SnapshotFolder, "Photo Album");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.LSLText) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.LSLText, "Scripts");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Sound) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Sound, "Sounds");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.Texture) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.Texture, "Textures");
|
||||
if (!Array.Exists(sysFolders, delegate (XInventoryFolder f) { if (f.type == (int)AssetType.TrashFolder) return true; return false; }))
|
||||
CreateFolder(principalID, rootFolder.ID, (int)AssetType.TrashFolder, "Trash");
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private XInventoryFolder CreateFolder(UUID principalID, UUID parentID, int type, string name)
|
||||
{
|
||||
XInventoryFolder newFolder = new XInventoryFolder();
|
||||
|
||||
newFolder.folderName = name;
|
||||
newFolder.type = type;
|
||||
newFolder.version = 1;
|
||||
newFolder.folderID = UUID.Random();
|
||||
newFolder.agentID = principalID;
|
||||
newFolder.parentFolderID = parentID;
|
||||
|
||||
m_Database.StoreFolder(newFolder);
|
||||
|
||||
return newFolder;
|
||||
}
|
||||
|
||||
private XInventoryFolder[] GetSystemFolders(UUID principalID)
|
||||
{
|
||||
XInventoryFolder[] allFolders = m_Database.GetFolders(
|
||||
new string[] { "agentID" },
|
||||
new string[] { principalID.ToString() });
|
||||
|
||||
XInventoryFolder[] sysFolders = Array.FindAll(
|
||||
allFolders,
|
||||
delegate (XInventoryFolder f)
|
||||
{
|
||||
if (f.type > 0)
|
||||
return true;
|
||||
return false;
|
||||
});
|
||||
|
||||
return sysFolders;
|
||||
}
|
||||
|
||||
public List<InventoryFolderBase> GetInventorySkeleton(UUID principalID)
|
||||
{
|
||||
XInventoryFolder[] allFolders = m_Database.GetFolders(
|
||||
new string[] { "agentID" },
|
||||
new string[] { principalID.ToString() });
|
||||
|
||||
if (allFolders.Length == 0)
|
||||
return null;
|
||||
|
||||
List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
|
||||
|
||||
foreach (XInventoryFolder x in allFolders)
|
||||
{
|
||||
m_log.DebugFormat("[INVENTORY]: Adding folder {0} to skeleton", x.folderName);
|
||||
folders.Add(ConvertToOpenSim(x));
|
||||
}
|
||||
|
||||
return folders;
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetRootFolder(UUID principalID)
|
||||
{
|
||||
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||
new string[] { "agentID", "parentFolderID"},
|
||||
new string[] { principalID.ToString(), UUID.Zero.ToString() });
|
||||
|
||||
if (folders.Length == 0)
|
||||
return null;
|
||||
|
||||
return ConvertToOpenSim(folders[0]);
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
|
||||
{
|
||||
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||
new string[] { "agentID", "type"},
|
||||
new string[] { principalID.ToString(), ((int)type).ToString() });
|
||||
|
||||
if (folders.Length == 0)
|
||||
return null;
|
||||
|
||||
return ConvertToOpenSim(folders[0]);
|
||||
}
|
||||
|
||||
public InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
|
||||
{
|
||||
// This method doesn't receive a valud principal id from the
|
||||
// connector. So we disregard the principal and look
|
||||
// by ID.
|
||||
//
|
||||
m_log.DebugFormat("[INVENTORY]: Fetch contents for folder {0}", folderID.ToString());
|
||||
InventoryCollection inventory = new InventoryCollection();
|
||||
inventory.UserID = principalID;
|
||||
inventory.Folders = new List<InventoryFolderBase>();
|
||||
inventory.Items = new List<InventoryItemBase>();
|
||||
|
||||
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||
new string[] { "parentFolderID"},
|
||||
new string[] { folderID.ToString() });
|
||||
|
||||
foreach (XInventoryFolder x in folders)
|
||||
{
|
||||
m_log.DebugFormat("[INVENTORY]: Adding folder {0} to response", x.folderName);
|
||||
inventory.Folders.Add(ConvertToOpenSim(x));
|
||||
}
|
||||
|
||||
XInventoryItem[] items = m_Database.GetItems(
|
||||
new string[] { "parentFolderID"},
|
||||
new string[] { folderID.ToString() });
|
||||
|
||||
foreach (XInventoryItem i in items)
|
||||
{
|
||||
m_log.DebugFormat("[INVENTORY]: Adding item {0} to response", i.inventoryName);
|
||||
inventory.Items.Add(ConvertToOpenSim(i));
|
||||
}
|
||||
|
||||
return inventory;
|
||||
}
|
||||
|
||||
public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
|
||||
{
|
||||
// Since we probably don't get a valid principal here, either ...
|
||||
//
|
||||
List<InventoryItemBase> invItems = new List<InventoryItemBase>();
|
||||
|
||||
XInventoryItem[] items = m_Database.GetItems(
|
||||
new string[] { "parentFolderID"},
|
||||
new string[] { UUID.Zero.ToString() });
|
||||
|
||||
foreach (XInventoryItem i in items)
|
||||
invItems.Add(ConvertToOpenSim(i));
|
||||
|
||||
return invItems;
|
||||
}
|
||||
|
||||
public bool AddFolder(InventoryFolderBase folder)
|
||||
{
|
||||
XInventoryFolder xFolder = ConvertFromOpenSim(folder);
|
||||
return m_Database.StoreFolder(xFolder);
|
||||
}
|
||||
|
||||
public bool UpdateFolder(InventoryFolderBase folder)
|
||||
{
|
||||
return AddFolder(folder);
|
||||
}
|
||||
|
||||
public bool MoveFolder(InventoryFolderBase folder)
|
||||
{
|
||||
XInventoryFolder[] x = m_Database.GetFolders(
|
||||
new string[] { "folderID" },
|
||||
new string[] { folder.ID.ToString() });
|
||||
|
||||
if (x.Length == 0)
|
||||
return false;
|
||||
|
||||
x[0].parentFolderID = folder.ParentID;
|
||||
|
||||
return m_Database.StoreFolder(x[0]);
|
||||
}
|
||||
|
||||
// We don't check the principal's ID here
|
||||
//
|
||||
public bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
|
||||
{
|
||||
// Ignore principal ID, it's bogus at connector level
|
||||
//
|
||||
foreach (UUID id in folderIDs)
|
||||
{
|
||||
InventoryFolderBase f = new InventoryFolderBase();
|
||||
f.ID = id;
|
||||
PurgeFolder(f);
|
||||
m_Database.DeleteFolders("folderID", id.ToString());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool PurgeFolder(InventoryFolderBase folder)
|
||||
{
|
||||
XInventoryFolder[] subFolders = m_Database.GetFolders(
|
||||
new string[] { "parentFolderID" },
|
||||
new string[] { folder.ID.ToString() });
|
||||
|
||||
foreach (XInventoryFolder x in subFolders)
|
||||
{
|
||||
PurgeFolder(ConvertToOpenSim(x));
|
||||
m_Database.DeleteFolders("folderID", x.folderID.ToString());
|
||||
}
|
||||
|
||||
m_Database.DeleteItems("parentFolderID", folder.ID.ToString());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool AddItem(InventoryItemBase item)
|
||||
{
|
||||
return m_Database.StoreItem(ConvertFromOpenSim(item));
|
||||
}
|
||||
|
||||
public bool UpdateItem(InventoryItemBase item)
|
||||
{
|
||||
return m_Database.StoreItem(ConvertFromOpenSim(item));
|
||||
}
|
||||
|
||||
public bool MoveItems(UUID principalID, List<InventoryItemBase> items)
|
||||
{
|
||||
// Principal is b0rked. *sigh*
|
||||
//
|
||||
foreach (InventoryItemBase i in items)
|
||||
{
|
||||
m_Database.MoveItem(i.ID.ToString(), i.Folder.ToString());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool DeleteItems(UUID principalID, List<UUID> itemIDs)
|
||||
{
|
||||
// Just use the ID... *facepalms*
|
||||
//
|
||||
foreach (UUID id in itemIDs)
|
||||
m_Database.DeleteItems("inventoryID", id.ToString());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public InventoryItemBase GetItem(InventoryItemBase item)
|
||||
{
|
||||
XInventoryItem[] items = m_Database.GetItems(
|
||||
new string[] { "inventoryID" },
|
||||
new string[] { item.ID.ToString() });
|
||||
|
||||
if (items.Length == 0)
|
||||
return null;
|
||||
|
||||
return ConvertToOpenSim(items[0]);
|
||||
}
|
||||
|
||||
public InventoryFolderBase GetFolder(InventoryFolderBase folder)
|
||||
{
|
||||
XInventoryFolder[] folders = m_Database.GetFolders(
|
||||
new string[] { "folderID"},
|
||||
new string[] { folder.ID.ToString() });
|
||||
|
||||
if (folders.Length == 0)
|
||||
return null;
|
||||
|
||||
return ConvertToOpenSim(folders[0]);
|
||||
}
|
||||
|
||||
public List<InventoryItemBase> GetActiveGestures(UUID principalID)
|
||||
{
|
||||
XInventoryItem[] items = m_Database.GetActiveGestures(principalID);
|
||||
|
||||
if (items.Length == 0)
|
||||
return null;
|
||||
|
||||
List<InventoryItemBase> ret = new List<InventoryItemBase>();
|
||||
|
||||
foreach (XInventoryItem x in items)
|
||||
ret.Add(ConvertToOpenSim(x));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
public int GetAssetPermissions(UUID principalID, UUID assetID)
|
||||
{
|
||||
return m_Database.GetAssetPermissions(principalID, assetID);
|
||||
}
|
||||
|
||||
// CM never needed those. Left unimplemented.
|
||||
// Obsolete in core
|
||||
//
|
||||
public InventoryCollection GetUserInventory(UUID userID)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
|
||||
{
|
||||
}
|
||||
|
||||
// Unused.
|
||||
//
|
||||
public bool HasInventoryForUser(UUID userID)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// CM Helpers
|
||||
//
|
||||
private InventoryFolderBase ConvertToOpenSim(XInventoryFolder folder)
|
||||
{
|
||||
InventoryFolderBase newFolder = new InventoryFolderBase();
|
||||
|
||||
newFolder.ParentID = folder.parentFolderID;
|
||||
newFolder.Type = (short)folder.type;
|
||||
newFolder.Version = (ushort)folder.version;
|
||||
newFolder.Name = folder.folderName;
|
||||
newFolder.Owner = folder.agentID;
|
||||
newFolder.ID = folder.folderID;
|
||||
|
||||
return newFolder;
|
||||
}
|
||||
|
||||
private XInventoryFolder ConvertFromOpenSim(InventoryFolderBase folder)
|
||||
{
|
||||
XInventoryFolder newFolder = new XInventoryFolder();
|
||||
|
||||
newFolder.parentFolderID = folder.ParentID;
|
||||
newFolder.type = (int)folder.Type;
|
||||
newFolder.version = (int)folder.Version;
|
||||
newFolder.folderName = folder.Name;
|
||||
newFolder.agentID = folder.Owner;
|
||||
newFolder.folderID = folder.ID;
|
||||
|
||||
return newFolder;
|
||||
}
|
||||
|
||||
private InventoryItemBase ConvertToOpenSim(XInventoryItem item)
|
||||
{
|
||||
InventoryItemBase newItem = new InventoryItemBase();
|
||||
|
||||
newItem.AssetID = item.assetID;
|
||||
newItem.AssetType = item.assetType;
|
||||
newItem.Name = item.inventoryName;
|
||||
newItem.Owner = item.avatarID;
|
||||
newItem.ID = item.inventoryID;
|
||||
newItem.InvType = item.invType;
|
||||
newItem.Folder = item.parentFolderID;
|
||||
newItem.CreatorId = item.creatorID.ToString();
|
||||
newItem.Description = item.inventoryDescription;
|
||||
newItem.NextPermissions = (uint)item.inventoryNextPermissions;
|
||||
newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions;
|
||||
newItem.BasePermissions = (uint)item.inventoryBasePermissions;
|
||||
newItem.EveryOnePermissions = (uint)item.inventoryEveryOnePermissions;
|
||||
newItem.GroupPermissions = (uint)item.inventoryGroupPermissions;
|
||||
newItem.GroupID = item.groupID;
|
||||
newItem.GroupOwned = item.groupOwned;
|
||||
newItem.SalePrice = item.salePrice;
|
||||
newItem.SaleType = (byte)item.saleType;
|
||||
newItem.Flags = (uint)item.flags;
|
||||
newItem.CreationDate = item.creationDate;
|
||||
|
||||
return newItem;
|
||||
}
|
||||
|
||||
private XInventoryItem ConvertFromOpenSim(InventoryItemBase item)
|
||||
{
|
||||
XInventoryItem newItem = new XInventoryItem();
|
||||
|
||||
newItem.assetID = item.AssetID;
|
||||
newItem.assetType = item.AssetType;
|
||||
newItem.inventoryName = item.Name;
|
||||
newItem.avatarID = item.Owner;
|
||||
newItem.inventoryID = item.ID;
|
||||
newItem.invType = item.InvType;
|
||||
newItem.parentFolderID = item.Folder;
|
||||
newItem.creatorID = item.CreatorIdAsUuid;
|
||||
newItem.inventoryDescription = item.Description;
|
||||
newItem.inventoryNextPermissions = (int)item.NextPermissions;
|
||||
newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions;
|
||||
newItem.inventoryBasePermissions = (int)item.BasePermissions;
|
||||
newItem.inventoryEveryOnePermissions = (int)item.EveryOnePermissions;
|
||||
newItem.inventoryGroupPermissions = (int)item.GroupPermissions;
|
||||
newItem.groupID = item.GroupID;
|
||||
newItem.groupOwned = item.GroupOwned;
|
||||
newItem.salePrice = item.SalePrice;
|
||||
newItem.saleType = (int)item.SaleType;
|
||||
newItem.flags = (int)item.Flags;
|
||||
newItem.creationDate = item.CreationDate;
|
||||
|
||||
return newItem;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -289,24 +289,24 @@ namespace OpenSim.Tests.Common.Mock
|
|||
public event PlacesQuery OnPlacesQuery;
|
||||
|
||||
public event FindAgentUpdate OnFindAgentEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
public event TrackAgentUpdate OnTrackAgentEvent;
|
||||
public event NewUserReport OnUserReportEvent;
|
||||
public event SaveStateHandler OnSaveStateEvent;
|
||||
public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
|
||||
public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
|
||||
public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
|
||||
public event FreezeUserUpdate OnParcelFreezeUserEvent;
|
||||
public event EjectUserUpdate OnParcelEjectUserEvent;
|
||||
public event ParcelBuyPass OnParcelBuyPass;
|
||||
public event ParcelGodMark OnParcelGodMark;
|
||||
public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
|
||||
public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
|
||||
public event SimWideDeletesDelegate OnSimWideDeletes;
|
||||
public event SendPostcard OnSendPostcard;
|
||||
public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
|
||||
public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
|
||||
public event GodlikeMessage onGodlikeMessageEvent;
|
||||
public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
|
||||
|
||||
#pragma warning restore 67
|
||||
|
||||
|
|
Loading…
Reference in New Issue