diff options
Diffstat (limited to '')
9 files changed, 66 insertions, 98 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index b93a41b..8f0ae76 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -134,7 +134,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
134 | AddNewInventoryItem = m_Scene.AddUploadedInventoryItem; | 134 | AddNewInventoryItem = m_Scene.AddUploadedInventoryItem; |
135 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; | 135 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; |
136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
137 | CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; | ||
138 | GetClient = m_Scene.SceneGraph.GetControllingClient; | 137 | GetClient = m_Scene.SceneGraph.GetControllingClient; |
139 | } | 138 | } |
140 | 139 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 1c1d83c..10f43d1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -42,18 +42,25 @@ using OpenSim.Capabilities.Handlers; | |||
42 | 42 | ||
43 | namespace OpenSim.Region.ClientStack.Linden | 43 | namespace OpenSim.Region.ClientStack.Linden |
44 | { | 44 | { |
45 | 45 | /// <summary> | |
46 | /// This module implements both WebFetchInventoryDescendents and FetchInventoryDescendents2 capabilities. | ||
47 | /// </summary> | ||
46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 48 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
47 | public class WebFetchInvDescModule : INonSharedRegionModule | 49 | public class WebFetchInvDescModule : INonSharedRegionModule |
48 | { | 50 | { |
49 | private static readonly ILog m_log = | 51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | |
51 | private Scene m_scene; | 53 | private Scene m_scene; |
52 | 54 | ||
53 | private IInventoryService m_InventoryService; | 55 | private IInventoryService m_InventoryService; |
54 | private ILibraryService m_LibraryService; | 56 | private ILibraryService m_LibraryService; |
55 | private bool m_Enabled = false; | 57 | |
56 | private string m_URL; | 58 | private bool m_Enabled; |
59 | |||
60 | private string m_fetchInventoryDescendents2Url; | ||
61 | private string m_webFetchInventoryDescendentsUrl; | ||
62 | |||
63 | private WebFetchInvDescHandler m_webFetchHandler; | ||
57 | 64 | ||
58 | #region ISharedRegionModule Members | 65 | #region ISharedRegionModule Members |
59 | 66 | ||
@@ -63,10 +70,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
63 | if (config == null) | 70 | if (config == null) |
64 | return; | 71 | return; |
65 | 72 | ||
66 | m_URL = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty); | 73 | m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty); |
67 | // Cap doesn't exist | 74 | m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty); |
68 | if (m_URL != string.Empty) | 75 | |
76 | if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty) | ||
77 | { | ||
69 | m_Enabled = true; | 78 | m_Enabled = true; |
79 | } | ||
70 | } | 80 | } |
71 | 81 | ||
72 | public void AddRegion(Scene s) | 82 | public void AddRegion(Scene s) |
@@ -91,8 +101,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
91 | if (!m_Enabled) | 101 | if (!m_Enabled) |
92 | return; | 102 | return; |
93 | 103 | ||
94 | m_InventoryService = m_scene.InventoryService; ; | 104 | m_InventoryService = m_scene.InventoryService; |
95 | m_LibraryService = m_scene.LibraryService; | 105 | m_LibraryService = m_scene.LibraryService; |
106 | |||
107 | // We'll reuse the same handler for all requests. | ||
108 | if (m_fetchInventoryDescendents2Url == "localhost" || m_webFetchInventoryDescendentsUrl == "localhost") | ||
109 | m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); | ||
110 | |||
96 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 111 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
97 | } | 112 | } |
98 | 113 | ||
@@ -111,26 +126,38 @@ namespace OpenSim.Region.ClientStack.Linden | |||
111 | 126 | ||
112 | #endregion | 127 | #endregion |
113 | 128 | ||
114 | public void RegisterCaps(UUID agentID, Caps caps) | 129 | private void RegisterCaps(UUID agentID, Caps caps) |
115 | { | 130 | { |
116 | UUID capID = UUID.Random(); | 131 | if (m_webFetchInventoryDescendentsUrl != "") |
132 | RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl); | ||
117 | 133 | ||
118 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 134 | if (m_fetchInventoryDescendents2Url != "") |
119 | if (m_URL == "localhost") | 135 | RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url); |
136 | } | ||
137 | |||
138 | private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url) | ||
139 | { | ||
140 | string capUrl; | ||
141 | |||
142 | if (url == "localhost") | ||
120 | { | 143 | { |
121 | m_log.InfoFormat("[WEBFETCHINVENTORYDESCENDANTS]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 144 | capUrl = "/CAPS/" + UUID.Random(); |
122 | WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); | 145 | |
123 | IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/" + UUID.Random(), webFetchHandler.FetchInventoryDescendentsRequest); | 146 | IRequestHandler reqHandler |
124 | caps.RegisterHandler("WebFetchInventoryDescendents", reqHandler); | 147 | = new RestStreamHandler("POST", capUrl, m_webFetchHandler.FetchInventoryDescendentsRequest); |
125 | // caps.RegisterHandler("FetchInventoryDescendents2", reqHandler); | 148 | |
149 | caps.RegisterHandler(capName, reqHandler); | ||
126 | } | 150 | } |
127 | else | 151 | else |
128 | { | 152 | { |
129 | m_log.InfoFormat("[WEBFETCHINVENTORYDESCENDANTS]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); | 153 | capUrl = url; |
130 | caps.RegisterHandler("WebFetchInventoryDescendents", m_URL); | 154 | |
131 | // caps.RegisterHandler("FetchInventoryDescendents2", m_URL); | 155 | caps.RegisterHandler(capName, capUrl); |
132 | } | 156 | } |
133 | } | ||
134 | 157 | ||
158 | // m_log.DebugFormat( | ||
159 | // "[WEB FETCH INV DESC MODULE]: Registered capability {0} at {1} in region {2} for {3}", | ||
160 | // capName, capUrl, m_scene.RegionInfo.RegionName, agentID); | ||
161 | } | ||
135 | } | 162 | } |
136 | } | 163 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 270e582..6ba74c7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -330,7 +330,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
330 | } | 330 | } |
331 | } | 331 | } |
332 | } | 332 | } |
333 | } | 333 | } |
334 | 334 | ||
335 | public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) | 335 | public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) |
336 | { | 336 | { |
@@ -484,6 +484,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
484 | // can be handled transparently). | 484 | // can be handled transparently). |
485 | InventoryFolderImpl fold = null; | 485 | InventoryFolderImpl fold = null; |
486 | if (LibraryService != null && LibraryService.LibraryRootFolder != null) | 486 | if (LibraryService != null && LibraryService.LibraryRootFolder != null) |
487 | { | ||
487 | if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null) | 488 | if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null) |
488 | { | 489 | { |
489 | remoteClient.SendInventoryFolderDetails( | 490 | remoteClient.SendInventoryFolderDetails( |
@@ -491,6 +492,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
491 | fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems); | 492 | fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems); |
492 | return; | 493 | return; |
493 | } | 494 | } |
495 | } | ||
494 | 496 | ||
495 | // We're going to send the reply async, because there may be | 497 | // We're going to send the reply async, because there may be |
496 | // an enormous quantity of packets -- basically the entire inventory! | 498 | // an enormous quantity of packets -- basically the entire inventory! |
@@ -511,64 +513,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
511 | SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState; | 513 | SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState; |
512 | d.EndInvoke(iar); | 514 | d.EndInvoke(iar); |
513 | } | 515 | } |
514 | |||
515 | /// <summary> | ||
516 | /// Handle the caps inventory descendents fetch. | ||
517 | /// | ||
518 | /// Since the folder structure is sent to the client on login, I believe we only need to handle items. | ||
519 | /// Diva comment 8/13/2009: what if someone gave us a folder in the meantime?? | ||
520 | /// </summary> | ||
521 | /// <param name="agentID"></param> | ||
522 | /// <param name="folderID"></param> | ||
523 | /// <param name="ownerID"></param> | ||
524 | /// <param name="fetchFolders"></param> | ||
525 | /// <param name="fetchItems"></param> | ||
526 | /// <param name="sortOrder"></param> | ||
527 | /// <returns>null if the inventory look up failed</returns> | ||
528 | public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID, | ||
529 | bool fetchFolders, bool fetchItems, int sortOrder, out int version) | ||
530 | { | ||
531 | m_log.DebugFormat( | ||
532 | "[INVENTORY CACHE]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", | ||
533 | fetchFolders, fetchItems, folderID, agentID); | ||
534 | |||
535 | // FIXME MAYBE: We're not handling sortOrder! | ||
536 | |||
537 | // TODO: This code for looking in the folder for the library should be folded back into the | ||
538 | // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. | ||
539 | // can be handled transparently). | ||
540 | InventoryFolderImpl fold; | ||
541 | if (LibraryService != null && LibraryService.LibraryRootFolder != null) | ||
542 | if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null) | ||
543 | { | ||
544 | version = 0; | ||
545 | InventoryCollection ret = new InventoryCollection(); | ||
546 | ret.Folders = new List<InventoryFolderBase>(); | ||
547 | ret.Items = fold.RequestListOfItems(); | ||
548 | |||
549 | return ret; | ||
550 | } | ||
551 | |||
552 | InventoryCollection contents = new InventoryCollection(); | ||
553 | |||
554 | if (folderID != UUID.Zero) | ||
555 | { | ||
556 | contents = InventoryService.GetFolderContent(agentID, folderID); | ||
557 | InventoryFolderBase containingFolder = new InventoryFolderBase(); | ||
558 | containingFolder.ID = folderID; | ||
559 | containingFolder.Owner = agentID; | ||
560 | containingFolder = InventoryService.GetFolder(containingFolder); | ||
561 | version = containingFolder.Version; | ||
562 | } | ||
563 | else | ||
564 | { | ||
565 | // Lost itemsm don't really need a version | ||
566 | version = 1; | ||
567 | } | ||
568 | |||
569 | return contents; | ||
570 | |||
571 | } | ||
572 | 516 | ||
573 | /// <summary> | 517 | /// <summary> |
574 | /// Handle an inventory folder creation request from the client. | 518 | /// Handle an inventory folder creation request from the client. |
@@ -643,14 +587,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
643 | } | 587 | } |
644 | } | 588 | } |
645 | 589 | ||
590 | delegate void PurgeFolderDelegate(UUID userID, UUID folder); | ||
591 | |||
646 | /// <summary> | 592 | /// <summary> |
647 | /// This should delete all the items and folders in the given directory. | 593 | /// This should delete all the items and folders in the given directory. |
648 | /// </summary> | 594 | /// </summary> |
649 | /// <param name="remoteClient"></param> | 595 | /// <param name="remoteClient"></param> |
650 | /// <param name="folderID"></param> | 596 | /// <param name="folderID"></param> |
651 | |||
652 | delegate void PurgeFolderDelegate(UUID userID, UUID folder); | ||
653 | |||
654 | public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID) | 597 | public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID) |
655 | { | 598 | { |
656 | PurgeFolderDelegate d = PurgeFolderAsync; | 599 | PurgeFolderDelegate d = PurgeFolderAsync; |
@@ -664,7 +607,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
664 | } | 607 | } |
665 | } | 608 | } |
666 | 609 | ||
667 | |||
668 | private void PurgeFolderAsync(UUID userID, UUID folderID) | 610 | private void PurgeFolderAsync(UUID userID, UUID folderID) |
669 | { | 611 | { |
670 | InventoryFolderBase folder = new InventoryFolderBase(folderID, userID); | 612 | InventoryFolderBase folder = new InventoryFolderBase(folderID, userID); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index d80944b..daddb90 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -832,8 +832,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
832 | invString.AddSectionEnd(); | 832 | invString.AddSectionEnd(); |
833 | 833 | ||
834 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); | 834 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); |
835 | invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); | 835 | invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type)); |
836 | invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); | 836 | invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType)); |
837 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); | 837 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); |
838 | 838 | ||
839 | invString.AddSaleStart(); | 839 | invString.AddSaleStart(); |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 7ab295a..2a6163c 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Physics.Manager | |||
56 | 56 | ||
57 | public abstract class PhysicsScene | 57 | public abstract class PhysicsScene |
58 | { | 58 | { |
59 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 59 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
62 | /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. | 62 | /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 489a23a..73c1c02 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
86 | private float CAPSULE_RADIUS = 0.37f; | 86 | private float CAPSULE_RADIUS = 0.37f; |
87 | private float CAPSULE_LENGTH = 2.140599f; | 87 | private float CAPSULE_LENGTH = 2.140599f; |
88 | private float m_tensor = 3800000f; | 88 | private float m_tensor = 3800000f; |
89 | private float heightFudgeFactor = 0.52f; | 89 | // private float heightFudgeFactor = 0.52f; |
90 | private float walkDivisor = 1.3f; | 90 | private float walkDivisor = 1.3f; |
91 | private float runDivisor = 0.8f; | 91 | private float runDivisor = 0.8f; |
92 | private bool flying = false; | 92 | private bool flying = false; |
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
149 | 149 | ||
150 | public OdeCharacter( | 150 | public OdeCharacter( |
151 | String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, | 151 | String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, |
152 | float capsule_radius, float tensor, float density, float height_fudge_factor, | 152 | float capsule_radius, float tensor, float density, |
153 | float walk_divisor, float rundivisor) | 153 | float walk_divisor, float rundivisor) |
154 | { | 154 | { |
155 | m_uuid = UUID.Random(); | 155 | m_uuid = UUID.Random(); |
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
187 | CAPSULE_RADIUS = capsule_radius; | 187 | CAPSULE_RADIUS = capsule_radius; |
188 | m_tensor = tensor; | 188 | m_tensor = tensor; |
189 | m_density = density; | 189 | m_density = density; |
190 | heightFudgeFactor = height_fudge_factor; | 190 | // heightFudgeFactor = height_fudge_factor; |
191 | walkDivisor = walk_divisor; | 191 | walkDivisor = walk_divisor; |
192 | runDivisor = rundivisor; | 192 | runDivisor = rundivisor; |
193 | 193 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 0456f56..5b28e7c 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
156 | private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode | 156 | private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode |
157 | public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } } | 157 | public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } } |
158 | private float avDensity = 80f; | 158 | private float avDensity = 80f; |
159 | private float avHeightFudgeFactor = 0.52f; | 159 | // private float avHeightFudgeFactor = 0.52f; |
160 | private float avMovementDivisorWalk = 1.3f; | 160 | private float avMovementDivisorWalk = 1.3f; |
161 | private float avMovementDivisorRun = 0.8f; | 161 | private float avMovementDivisorRun = 0.8f; |
162 | private float minimumGroundFlightOffset = 3f; | 162 | private float minimumGroundFlightOffset = 3f; |
@@ -316,7 +316,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
316 | private int m_physicsiterations = 10; | 316 | private int m_physicsiterations = 10; |
317 | private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag | 317 | private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag |
318 | private readonly PhysicsActor PANull = new NullPhysicsActor(); | 318 | private readonly PhysicsActor PANull = new NullPhysicsActor(); |
319 | private float step_time = 0.0f; | 319 | // private float step_time = 0.0f; |
320 | //Ckrinke: Comment out until used. We declare it, initialize it, but do not use it | 320 | //Ckrinke: Comment out until used. We declare it, initialize it, but do not use it |
321 | //Ckrinke private int ms = 0; | 321 | //Ckrinke private int ms = 0; |
322 | public IntPtr world; | 322 | public IntPtr world; |
@@ -479,7 +479,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
479 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); | 479 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); |
480 | 480 | ||
481 | avDensity = physicsconfig.GetFloat("av_density", 80f); | 481 | avDensity = physicsconfig.GetFloat("av_density", 80f); |
482 | avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f); | 482 | // avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f); |
483 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); | 483 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); |
484 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); | 484 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); |
485 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); | 485 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); |
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1706 | OdeCharacter newAv | 1706 | OdeCharacter newAv |
1707 | = new OdeCharacter( | 1707 | = new OdeCharacter( |
1708 | avName, this, pos, size, avPIDD, avPIDP, | 1708 | avName, this, pos, size, avPIDD, avPIDP, |
1709 | avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, | 1709 | avCapRadius, avStandupTensor, avDensity, |
1710 | avMovementDivisorWalk, avMovementDivisorRun); | 1710 | avMovementDivisorWalk, avMovementDivisorRun); |
1711 | 1711 | ||
1712 | newAv.Flying = isFlying; | 1712 | newAv.Flying = isFlying; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 5527d14..3eeb23d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
140 | List<SenseRepeatClass> NewSensors = new List<SenseRepeatClass>(); | 140 | List<SenseRepeatClass> NewSensors = new List<SenseRepeatClass>(); |
141 | foreach (SenseRepeatClass ts in SenseRepeaters) | 141 | foreach (SenseRepeatClass ts in SenseRepeaters) |
142 | { | 142 | { |
143 | if (ts.localID != m_localID && ts.itemID != m_itemID) | 143 | if (ts.localID != m_localID || ts.itemID != m_itemID) |
144 | { | 144 | { |
145 | NewSensors.Add(ts); | 145 | NewSensors.Add(ts); |
146 | } | 146 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f9af9c1..f9d6eee 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
55 | { | 55 | { |
56 | public class ScriptInstance : MarshalByRefObject, IScriptInstance | 56 | public class ScriptInstance : MarshalByRefObject, IScriptInstance |
57 | { | 57 | { |
58 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
59 | 59 | ||
60 | private IScriptEngine m_Engine; | 60 | private IScriptEngine m_Engine; |
61 | private IScriptWorkItem m_CurrentResult = null; | 61 | private IScriptWorkItem m_CurrentResult = null; |