aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-16 15:28:51 +0100
committerMelanie Thielker2015-11-16 15:28:51 +0100
commitf93ce485b1df8c1c8a7ff1a44b280ce30b8707b9 (patch)
treef047a5e4f8907d21b06a200291aa47f5c4fe2a4a
parent handle diferente number of wearables on getting assets form another appearance (diff)
parent fix the protection for more Wearables than region suports (diff)
downloadopensim-SC_OLD-0.9.0.zip
opensim-SC_OLD-0.9.0.tar.gz
opensim-SC_OLD-0.9.0.tar.bz2
opensim-SC_OLD-0.9.0.tar.xz
Merge branch 'master' into avinationmerge0.9.0
Conflicts: OpenSim/Framework/AvatarAppearance.cs
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs7
-rw-r--r--bin/OpenSimDefaults.ini10
2 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 07c739d..79a66ab 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -490,7 +490,14 @@ namespace OpenSim.Framework
490 m_wearables[i] = new AvatarWearable(); 490 m_wearables[i] = new AvatarWearable();
491 } 491 }
492 m_wearables[wearableId].Clear(); 492 m_wearables[wearableId].Clear();
493<<<<<<< HEAD
493 for (int i = 0; i < wearable.Count; i++) 494 for (int i = 0; i < wearable.Count; i++)
495=======
496 int count = wearable.Count;
497 if (count > AvatarWearable.MAX_WEARABLES)
498 count = AvatarWearable.MAX_WEARABLES;
499 for (int i = 0; i < count; i++)
500>>>>>>> master
494 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); 501 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
495 } 502 }
496 503
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1481fca..f1d6f84 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -167,13 +167,13 @@
167 InworldRestartShutsDown = false 167 InworldRestartShutsDown = false
168 168
169 ; Use of normalized 55FPS statistics 169 ; Use of normalized 55FPS statistics
170 ; Opensim does not have a frame rate control like other simulators 170 ; Opensim does not have a frame rate control like other simulators.
171 ; Most parameters that control timing can be configurable region by region 171 ; Most parameters that control timing can be configurable region by region.
172 ; To achive closer compatibility with values expected by viewers, scripts and users 172 ; To achieve closer compatibility with values expected by viewers, scripts and users
173 ; some parameters are converted to a equivalent per frame value. 173 ; some parameters are converted to a equivalent per frame value.
174 ; Adicionaly they are scaled to values they whould have on a system running at a nominal 55 frames per second rate 174 ; Additionally, they are scaled to values they would have on a system running at a nominal 55 frames per second rate.
175 ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration 175 ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration
176 ; You can choose to not apply this scale factor setting Normalized55FPS to false. 176 ; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false.
177 ; Normalized55FPS = true 177 ; Normalized55FPS = true
178 178
179 ; Main Frame time 179 ; Main Frame time