diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 92d93ee..0f57c2e 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -234,13 +234,9 @@ namespace OpenSim.Services.LLLoginService | |||
234 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, | 234 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, |
235 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 235 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
236 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 236 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
237 | <<<<<<< HEAD | 237 | |
238 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, | ||
239 | string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee, int maxAgentGroups) | ||
240 | ======= | ||
241 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, | 238 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, |
242 | string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee) | 239 | string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee,int maxAgentGroups) |
243 | >>>>>>> avn/ubitvar | ||
244 | : this() | 240 | : this() |
245 | { | 241 | { |
246 | FillOutInventoryData(invSkel, libService); | 242 | FillOutInventoryData(invSkel, libService); |