aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorBlueWall2012-10-19 07:46:00 -0400
committerBlueWall2012-10-19 07:46:00 -0400
commit276600ab71a44987ede0bef243cd6ae82c08055d (patch)
tree344f486f78b95193353a072152836d882e87ab45 /OpenSim/Region/ClientStack
parentMove PluginManager (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.zip
opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.tar.gz
opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.tar.bz2
opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.tar.xz
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0869bd5..62f51d9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -47,6 +47,7 @@ using OpenSim.Region.Framework.Scenes;
47using OpenSim.Services.Interfaces; 47using OpenSim.Services.Interfaces;
48using Timer = System.Timers.Timer; 48using Timer = System.Timers.Timer;
49using AssetLandmark = OpenSim.Framework.AssetLandmark; 49using AssetLandmark = OpenSim.Framework.AssetLandmark;
50using RegionFlags = OpenMetaverse.RegionFlags;
50using Nini.Config; 51using Nini.Config;
51 52
52using System.IO; 53using System.IO;