aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2011-11-14 20:03:47 +0000
committerMelanie2011-11-14 20:03:47 +0000
commitafca742392e30748de13a125f932046949af0bcb (patch)
tree34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Region/ClientStack
parentMerge branch 'master' into bigmerge (diff)
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC-afca742392e30748de13a125f932046949af0bcb.zip
opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.gz
opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.bz2
opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 2e76acb..8fdbe7b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11197,6 +11197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11197 Utils.BytesToString(avatarInterestUpdate.PropertiesData.LanguagesText)); 11197 Utils.BytesToString(avatarInterestUpdate.PropertiesData.LanguagesText));
11198 return true; 11198 return true;
11199 } 11199 }
11200
11200 private bool HandleGrantUserRights(IClientAPI sender, Packet Pack) 11201 private bool HandleGrantUserRights(IClientAPI sender, Packet Pack)
11201 { 11202 {
11202 GrantUserRightsPacket GrantUserRights = 11203 GrantUserRightsPacket GrantUserRights =
@@ -11217,6 +11218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11217 GrantUserRights.Rights[0].RelatedRights); 11218 GrantUserRights.Rights[0].RelatedRights);
11218 return true; 11219 return true;
11219 } 11220 }
11221
11220 private bool HandlePlacesQuery(IClientAPI sender, Packet Pack) 11222 private bool HandlePlacesQuery(IClientAPI sender, Packet Pack)
11221 { 11223 {
11222 PlacesQueryPacket placesQueryPacket = 11224 PlacesQueryPacket placesQueryPacket =