|  a7eb1b5b85 Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||
|---|---|---|
| .. | ||
| Properties | ||
| NullAuthenticationData.cs | ||
| NullAvatarData.cs | ||
| NullEstateData.cs | ||
| NullFriendsData.cs | ||
| NullGenericDataHandler.cs | ||
| NullInventoryData.cs | ||
| NullPresenceData.cs | ||
| NullRegionData.cs | ||
| NullSimulationData.cs | ||
| NullUserAccountData.cs | ||
| NullXGroupData.cs | ||