ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination-current'

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
This commit is contained in:
Melanie Thielker
2014-07-19 22:32:07 +02:00
parent 95b89dd450 9654b81b2d
commit e1b2ecdfdc
18 changed files with 709 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -1626,7 +1626,12 @@ namespace OpenSim.Framework
BREAST_PHYSICS_LEFTRIGHT_MAX_EFFECT = 247,
BREAST_PHYSICS_LEFTRIGHT_SPRING= 248,
BREAST_PHYSICS_LEFTRIGHT_GAIN = 249,
BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250
BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250,
// Ubit: 07/96/2013 new parameters
_APPEARANCEMESSAGE_VERSION = 251, //ID 11000
SHAPE_HOVER = 252, //ID 11001
}
#endregion
}