![]() Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs |
||
---|---|---|
.. | ||
InternetRelayClientView | ||
TextureSender | ||
UDP/Linden |
![]() Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs |
||
---|---|---|
.. | ||
InternetRelayClientView | ||
TextureSender | ||
UDP/Linden |