![]() Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Framework/VersionInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs OpenSim/Region/PhysicsModules/Ode/OdeScene.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Services/Interfaces/IAvatarService.cs OpenSim/Services/LLLoginService/LLLoginService.cs |
||
---|---|---|
.. | ||
Properties | ||
IAgentPreferencesService.cs | ||
IAssetService.cs | ||
IAttachmentsService.cs | ||
IAuthenticationService.cs | ||
IAuthorizationService.cs | ||
IAvatarService.cs | ||
IBakedTextureService.cs | ||
IBansService.cs | ||
IBasicProfileService.cs | ||
IEstateDataService.cs | ||
IFreeswitchService.cs | ||
IFriendsService.cs | ||
IGridService.cs | ||
IGridUserService.cs | ||
IHypergridServices.cs | ||
IInventoryService.cs | ||
ILandService.cs | ||
ILibraryService.cs | ||
ILoginService.cs | ||
IMapImageService.cs | ||
INeighbourService.cs | ||
IOfflineIMService.cs | ||
IPresenceService.cs | ||
ISimulationService.cs | ||
IUserAccountService.cs | ||
IUserManagement.cs | ||
IUserProfilesService.cs | ||
OpenProfileClient.cs |