aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2010-10-06 05:44:19 +0100
committerMelanie2010-10-06 05:44:19 +0100
commitd45276b3f6a309f77ddfac1e83dbe2db377883fa (patch)
treebb01ca2c342a630be049aee0c62451fe198766c8 /OpenSim/Region/OptionalModules
parentConvert worldview to GET (diff)
downloadopensim-SC_OLD-d45276b3f6a309f77ddfac1e83dbe2db377883fa.zip
opensim-SC_OLD-d45276b3f6a309f77ddfac1e83dbe2db377883fa.tar.gz
opensim-SC_OLD-d45276b3f6a309f77ddfac1e83dbe2db377883fa.tar.bz2
opensim-SC_OLD-d45276b3f6a309f77ddfac1e83dbe2db377883fa.tar.xz
Add and plumb the usetex URL parameter to worldview. Required but not yet
functional
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs6
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
index 55be9ba..d4b7020 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -104,13 +104,13 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
104 } 104 }
105 105
106 public byte[] GenerateWorldView(Vector3 pos, Vector3 rot, float fov, 106 public byte[] GenerateWorldView(Vector3 pos, Vector3 rot, float fov,
107 int width, int height) 107 int width, int height, bool usetex)
108 { 108 {
109 if (!m_Enabled) 109 if (!m_Enabled)
110 return new Byte[0]; 110 return new Byte[0];
111 111
112 Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, 112 Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width,
113 height); 113 height, usetex);
114 114
115 MemoryStream str = new MemoryStream(); 115 MemoryStream str = new MemoryStream();
116 116
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
index bfdcdb4..f47d9c7 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
@@ -96,6 +96,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
96 float fov; 96 float fov;
97 int width; 97 int width;
98 int height; 98 int height;
99 bool usetex;
99 100
100 if (!request.ContainsKey("posX")) 101 if (!request.ContainsKey("posX"))
101 return new Byte[0]; 102 return new Byte[0];
@@ -115,6 +116,8 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
115 return new Byte[0]; 116 return new Byte[0];
116 if (!request.ContainsKey("height")) 117 if (!request.ContainsKey("height"))
117 return new Byte[0]; 118 return new Byte[0];
119 if (!request.ContainsKey("usetex"))
120 return new Byte[0];
118 121
119 try 122 try
120 { 123 {
@@ -127,6 +130,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
127 fov = Convert.ToSingle(request["fov"]); 130 fov = Convert.ToSingle(request["fov"]);
128 width = Convert.ToInt32(request["width"]); 131 width = Convert.ToInt32(request["width"]);
129 height = Convert.ToInt32(request["height"]); 132 height = Convert.ToInt32(request["height"]);
133 usetex = Convert.ToBoolean(request["usetex"]);
130 } 134 }
131 catch 135 catch
132 { 136 {
@@ -137,7 +141,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
137 Vector3 rot = new Vector3(rotX, rotY, rotZ); 141 Vector3 rot = new Vector3(rotX, rotY, rotZ);
138 142
139 return m_WorldViewModule.GenerateWorldView(pos, rot, fov, width, 143 return m_WorldViewModule.GenerateWorldView(pos, rot, fov, width,
140 height); 144 height, usetex);
141 } 145 }
142 } 146 }
143} 147}