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

Merge branch 'master' into avinationmerge 

Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
avinationmerge 0.9.0
Melanie Thielker 2015-11-16 15:28:51 +01:00
parent 53e0cd5534 bcb27d4406
commit f93ce485b1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/AvatarAppearance.cs
View File

@ -490,7 +490,14 @@ namespace OpenSim.Framework
m_wearables[i] = new AvatarWearable(); m_wearables[i] = new AvatarWearable();
} }
m_wearables[wearableId].Clear(); m_wearables[wearableId].Clear();
<<<<<<< HEAD
for (int i = 0; i < wearable.Count; i++) for (int i = 0; i < wearable.Count; i++)
=======
int count = wearable.Count;
if (count > AvatarWearable.MAX_WEARABLES)
count = AvatarWearable.MAX_WEARABLES;
for (int i = 0; i < count; i++)
>>>>>>> master
m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
} }

10
bin/OpenSimDefaults.ini
View File

@ -167,13 +167,13 @@
InworldRestartShutsDown = false InworldRestartShutsDown = false
; Use of normalized 55FPS statistics ; Use of normalized 55FPS statistics
; Opensim does not have a frame rate control like other simulators ; Opensim does not have a frame rate control like other simulators.
; Most parameters that control timing can be configurable region by region ; Most parameters that control timing can be configurable region by region.
; To achive closer compatibility with values expected by viewers, scripts and users ; To achieve closer compatibility with values expected by viewers, scripts and users
; some parameters are converted to a equivalent per frame value. ; some parameters are converted to a equivalent per frame value.
; Adicionaly they are scaled to values they whould have on a system running at a nominal 55 frames per second rate ; Additionally, they are scaled to values they would have on a system running at a nominal 55 frames per second rate.
; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration
; You can choose to not apply this scale factor setting Normalized55FPS to false. ; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false.
; Normalized55FPS = true ; Normalized55FPS = true
; Main Frame time ; Main Frame time