![]() Conflicts: OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs |
||
---|---|---|
.. | ||
IAssetService.cs | ||
IAuthenticationService.cs | ||
IAuthorizationService.cs | ||
IAvatarService.cs | ||
IBasicProfileService.cs | ||
IFreeswitchService.cs | ||
IFriendsService.cs | ||
IGatekeeperService.cs | ||
IGridService.cs | ||
IGridUserService.cs | ||
IInventoryService.cs | ||
ILandService.cs | ||
ILibraryService.cs | ||
ILoginService.cs | ||
IMapService.cs | ||
INeighbourService.cs | ||
IPresenceService.cs | ||
ISimulationService.cs | ||
IUserAccountService.cs |