![]() Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs |
||
---|---|---|
.. | ||
Properties | ||
NullAuthenticationData.cs | ||
NullAvatarData.cs | ||
NullEstateData.cs | ||
NullFriendsData.cs | ||
NullInventoryData.cs | ||
NullPresenceData.cs | ||
NullRegionData.cs | ||
NullSimulationData.cs | ||
NullUserAccountData.cs |