aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs14
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs12
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs3
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs28
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs20
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs27
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs11
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
-rwxr-xr-xbin/OpenMetaverse.Rendering.Meshmerizer.dllbin20480 -> 20480 bytes
-rwxr-xr-xbin/OpenMetaverse.StructuredData.dllbin102400 -> 102400 bytes
-rwxr-xr-xbin/OpenMetaverse.dllbin1716224 -> 1736704 bytes
-rwxr-xr-xbin/OpenMetaverseTypes.dllbin114688 -> 114688 bytes
-rw-r--r--bin/config-include/GridCommon.ini.example8
-rw-r--r--bin/config-include/StandaloneCommon.ini.example8
-rw-r--r--bin/mssql_connection.ini.example18
19 files changed, 105 insertions, 54 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
index 317afac..ab9df4c 100644
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Data.MSSQL
358 358
359 string where = String.Join(" AND ", terms.ToArray()); 359 string where = String.Join(" AND ", terms.ToArray());
360 360
361 string query = String.Format("DELETE * FROM {0} WHERE {1}", m_Realm, where); 361 string query = String.Format("DELETE FROM {0} WHERE {1}", m_Realm, where);
362 362
363 cmd.Connection = conn; 363 cmd.Connection = conn;
364 cmd.CommandText = query; 364 cmd.CommandText = query;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f3ac2df..137f432 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1159,7 +1159,19 @@ namespace OpenSim.Framework
1159 void SendAgentAlertMessage(string message, bool modal); 1159 void SendAgentAlertMessage(string message, bool modal);
1160 void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url); 1160 void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);
1161 1161
1162 void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, 1162 /// <summary>
1163 /// Open a dialog box on the client.
1164 /// </summary>
1165 /// <param name="objectname"></param>
1166 /// <param name="objectID"></param>
1167 /// <param name="ownerID">/param>
1168 /// <param name="ownerFirstName"></param>
1169 /// <param name="ownerLastName"></param>
1170 /// <param name="msg"></param>
1171 /// <param name="textureID"></param>
1172 /// <param name="ch"></param>
1173 /// <param name="buttonlabels"></param>
1174 void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch,
1163 string[] buttonlabels); 1175 string[] buttonlabels);
1164 1176
1165 bool AddMoney(int debit); 1177 bool AddMoney(int debit);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5a2c45c..d8fcb62 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1469,6 +1469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1469 money.MoneyData.TransactionSuccess = success; 1469 money.MoneyData.TransactionSuccess = success;
1470 money.MoneyData.Description = description; 1470 money.MoneyData.Description = description;
1471 money.MoneyData.MoneyBalance = balance; 1471 money.MoneyData.MoneyBalance = balance;
1472 money.TransactionInfo.ItemDescription = Util.StringToBytes256("NONE");
1472 OutPacket(money, ThrottleOutPacketType.Task); 1473 OutPacket(money, ThrottleOutPacketType.Task);
1473 } 1474 }
1474 1475
@@ -2213,7 +2214,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2213 OutPacket(loadURL, ThrottleOutPacketType.Task); 2214 OutPacket(loadURL, ThrottleOutPacketType.Task);
2214 } 2215 }
2215 2216
2216 public void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 2217 public void SendDialog(
2218 string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg,
2219 UUID textureID, int ch, string[] buttonlabels)
2217 { 2220 {
2218 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); 2221 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
2219 dialog.Data.ObjectID = objectID; 2222 dialog.Data.ObjectID = objectID;
@@ -2231,6 +2234,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2231 buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]); 2234 buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
2232 } 2235 }
2233 dialog.Buttons = buttons; 2236 dialog.Buttons = buttons;
2237
2238 dialog.OwnerData = new ScriptDialogPacket.OwnerDataBlock[1];
2239 dialog.OwnerData[0] = new ScriptDialogPacket.OwnerDataBlock();
2240 dialog.OwnerData[0].OwnerID = ownerID;
2241
2234 OutPacket(dialog, ThrottleOutPacketType.Task); 2242 OutPacket(dialog, ThrottleOutPacketType.Task);
2235 } 2243 }
2236 2244
@@ -2293,8 +2301,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2293 OrbitalPosition = (OrbitalPosition - m_sunPainDaHalfOrbitalCutoff) * 0.6666666667f + m_sunPainDaHalfOrbitalCutoff; 2301 OrbitalPosition = (OrbitalPosition - m_sunPainDaHalfOrbitalCutoff) * 0.6666666667f + m_sunPainDaHalfOrbitalCutoff;
2294 } 2302 }
2295 2303
2296
2297
2298 SimulatorViewerTimeMessagePacket viewertime = (SimulatorViewerTimeMessagePacket)PacketPool.Instance.GetPacket(PacketType.SimulatorViewerTimeMessage); 2304 SimulatorViewerTimeMessagePacket viewertime = (SimulatorViewerTimeMessagePacket)PacketPool.Instance.GetPacket(PacketType.SimulatorViewerTimeMessage);
2299 viewertime.TimeInfo.SunDirection = Position; 2305 viewertime.TimeInfo.SunDirection = Position;
2300 viewertime.TimeInfo.SunAngVelocity = Velocity; 2306 viewertime.TimeInfo.SunAngVelocity = Velocity;
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 8a977c9..0db31eb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -124,7 +124,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
124 124
125 ScenePresence sp = m_scene.GetScenePresence(avatarID); 125 ScenePresence sp = m_scene.GetScenePresence(avatarID);
126 if (sp != null) 126 if (sp != null)
127 sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); 127 sp.ControllingClient.SendDialog(
128 objectName, objectID, ownerID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
128 } 129 }
129 130
130 public void SendUrlToUser( 131 public void SendUrlToUser(
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 5ab334f..0781de0 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
30using log4net; 31using log4net;
@@ -58,7 +59,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
58 59
59 #endregion 60 #endregion
60 61
61 protected override void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) 62 protected override List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
62 { 63 {
63 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 64 List<MapBlockData> mapBlocks = new List<MapBlockData>();
64 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 65 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
@@ -67,9 +68,26 @@ namespace OpenSim.Region.CoreModules.Hypergrid
67 68
68 foreach (GridRegion r in regions) 69 foreach (GridRegion r in regions)
69 { 70 {
70 MapBlockData block = new MapBlockData(); 71 uint x = 0, y = 0;
71 MapBlockFromGridRegion(block, r); 72 long handle = 0;
72 mapBlocks.Add(block); 73 if (r.RegionSecret != null && r.RegionSecret != string.Empty)
74 {
75 if (long.TryParse(r.RegionSecret, out handle))
76 {
77 Utils.LongToUInts((ulong)handle, out x, out y);
78 x = x / Constants.RegionSize;
79 y = y / Constants.RegionSize;
80 }
81 }
82
83 if (handle == 0 ||
84 // Check the distance from the current region
85 (handle != 0 && Math.Abs((int)(x - m_scene.RegionInfo.RegionLocX)) < 4096 && Math.Abs((int)(y - m_scene.RegionInfo.RegionLocY)) < 4096))
86 {
87 MapBlockData block = new MapBlockData();
88 MapBlockFromGridRegion(block, r);
89 mapBlocks.Add(block);
90 }
73 } 91 }
74 92
75 // Different from super 93 // Different from super
@@ -77,6 +95,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
77 // 95 //
78 96
79 remoteClient.SendMapBlock(mapBlocks, 0); 97 remoteClient.SendMapBlock(mapBlocks, 0);
98
99 return mapBlocks;
80 } 100 }
81 101
82 102
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0cacf2d..10e1631 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -233,20 +233,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
233 } 233 }
234 if (lookup) 234 if (lookup)
235 { 235 {
236 List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; 236 List<MapBlockData> mapBlocks = GetAndSendBlocks(avatarPresence.ControllingClient, (int)(m_scene.RegionInfo.RegionLocX) - 4, (int)(m_scene.RegionInfo.RegionLocY) - 4,
237 237 (int)(m_scene.RegionInfo.RegionLocX) + 4, (int)(m_scene.RegionInfo.RegionLocY) + 4, 0);
238 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
239 (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
240 (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
241 (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
242 (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
243 foreach (GridRegion r in regions)
244 {
245 MapBlockData block = new MapBlockData();
246 MapBlockFromGridRegion(block, r);
247 mapBlocks.Add(block);
248 }
249 avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
250 238
251 lock (cachedMapBlocks) 239 lock (cachedMapBlocks)
252 cachedMapBlocks = mapBlocks; 240 cachedMapBlocks = mapBlocks;
@@ -832,7 +820,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
832 } 820 }
833 } 821 }
834 822
835 protected virtual void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) 823 protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
836 { 824 {
837 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 825 List<MapBlockData> mapBlocks = new List<MapBlockData>();
838 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 826 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
@@ -847,6 +835,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
847 mapBlocks.Add(block); 835 mapBlocks.Add(block);
848 } 836 }
849 remoteClient.SendMapBlock(mapBlocks, 0); 837 remoteClient.SendMapBlock(mapBlocks, 0);
838
839 return mapBlocks;
850 } 840 }
851 841
852 protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r) 842 protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r)
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 89e9e20..56b46d7 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -540,7 +540,7 @@ namespace OpenSim.Region.Examples.SimpleModule
540 { 540 {
541 } 541 }
542 542
543 public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 543 public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
544 { 544 {
545 } 545 }
546 546
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 4b6e52e..88db20e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1177,7 +1177,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1177 IRC_SendChannelPrivmsg(objectname,url); 1177 IRC_SendChannelPrivmsg(objectname,url);
1178 } 1178 }
1179 1179
1180 public void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 1180 public void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
1181 { 1181 {
1182 1182
1183 } 1183 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 1c791b9..05223e0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1231,20 +1231,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1231 List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(requestingClient.AgentId, dataForAgentID); 1231 List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(requestingClient.AgentId, dataForAgentID);
1232 GroupMembershipData[] membershipArray; 1232 GroupMembershipData[] membershipArray;
1233 1233
1234 if (requestingClient.AgentId != dataForAgentID) 1234 // c_scene and property accessor 'is_god' are in support of the opertions to bypass 'hidden' group attributes for
1235 { 1235 // those with a GodLike aspect.
1236 Scene c_scene = (Scene) requestingClient.Scene;
1237 bool is_god = c_scene.Permissions.IsGod(requestingClient.AgentId);
1238
1239 if(is_god) {
1236 Predicate<GroupMembershipData> showInProfile = delegate(GroupMembershipData membership) 1240 Predicate<GroupMembershipData> showInProfile = delegate(GroupMembershipData membership)
1237 { 1241 {
1238 return membership.ListInProfile; 1242 return membership.ListInProfile;
1239 }; 1243 };
1240 1244
1241 membershipArray = membershipData.FindAll(showInProfile).ToArray(); 1245 membershipArray = membershipData.ToArray();
1242 } 1246 }
1243 else 1247 else
1244 { 1248 {
1245 membershipArray = membershipData.ToArray();
1246 }
1247 1249
1250 if (requestingClient.AgentId != dataForAgentID)
1251 {
1252 Predicate<GroupMembershipData> showInProfile = delegate(GroupMembershipData membership)
1253 {
1254 return membership.ListInProfile;
1255 };
1256
1257 membershipArray = membershipData.FindAll(showInProfile).ToArray();
1258 }
1259 else
1260 {
1261 membershipArray = membershipData.ToArray();
1262 }
1263 }
1248 if (m_debugEnabled) 1264 if (m_debugEnabled)
1249 { 1265 {
1250 m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); 1266 m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId);
@@ -1257,6 +1273,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1257 return membershipArray; 1273 return membershipArray;
1258 } 1274 }
1259 1275
1276
1260 private void SendAgentDataUpdate(IClientAPI remoteClient, UUID dataForAgentID, UUID activeGroupID, string activeGroupName, ulong activeGroupPowers, string activeGroupTitle) 1277 private void SendAgentDataUpdate(IClientAPI remoteClient, UUID dataForAgentID, UUID activeGroupID, string activeGroupName, ulong activeGroupPowers, string activeGroupTitle)
1261 { 1278 {
1262 if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); 1279 if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 2504e30..15bc1b7 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -631,7 +631,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
631 { 631 {
632 } 632 }
633 633
634 public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 634 public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
635 { 635 {
636 } 636 }
637 637
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index c539047..5262598 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -363,10 +363,13 @@ namespace OpenSim.Services.GridService
363 else 363 else
364 regInfo.RegionName = externalName; 364 regInfo.RegionName = externalName;
365 365
366 m_log.Debug("[HYPERGRID LINKER]: naming linked region " + regInfo.RegionName); 366 m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString());
367 367
368 // Get the map image 368 // Get the map image
369 regInfo.TerrainImage = m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory); 369 regInfo.TerrainImage = GetMapImage(regionID, imageURL);
370
371 // Store the origin's coordinates somewhere
372 regInfo.RegionSecret = handle.ToString();
370 373
371 AddHyperlinkRegion(regInfo, handle); 374 AddHyperlinkRegion(regInfo, handle);
372 m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage); 375 m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage);
@@ -463,6 +466,10 @@ namespace OpenSim.Services.GridService
463 m_Database.Delete(regionID); 466 m_Database.Delete(regionID);
464 } 467 }
465 468
469 public UUID GetMapImage(UUID regionID, string imageURL)
470 {
471 return m_GatekeeperConnector.GetMapImage(regionID, imageURL, m_MapTileDirectory);
472 }
466 #endregion 473 #endregion
467 474
468 475
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index dca5626..bf91ab5 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -637,7 +637,7 @@ namespace OpenSim.Tests.Common.Mock
637 { 637 {
638 } 638 }
639 639
640 public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 640 public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
641 { 641 {
642 } 642 }
643 643
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 6139a9d..a6dec04 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index e3b729c..ed0a2d6 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 69c4e9b..37ec47a 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index cab014d..6f7fbac 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e022f1f..c5c26ec 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -14,6 +14,14 @@
14 ; Uncomment this line if you are using MySQL and want to use a different database for estates 14 ; Uncomment this line if you are using MySQL and want to use a different database for estates
15 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" 15 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
16 16
17 ; MSSQL
18 ; Uncomment these lines if you want to use MSSQL storage
19 ; Change the connection string to your db details
20 ; The value for server property is shown in your SQL Server Management Studio login dialog.
21 ; (This sample is the default of express edition)
22 ;StorageProvider = "OpenSim.Data.MSSQL.dll"
23 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
24
17[AssetService] 25[AssetService]
18 26
19 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 27 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 931a77b..57380ee 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -16,6 +16,14 @@
16 ; Uncomment this line if you are using MySQL and want to use a different database for estates 16 ; Uncomment this line if you are using MySQL and want to use a different database for estates
17 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" 17 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
18 18
19 ; MSSQL
20 ; Uncomment these lines if you want to use MSSQL storage
21 ; Change the connection string to your db details
22 ; The value for server property is shown in your SQL Server Management Studio login dialog.
23 ; (This sample is the default of express edition)
24 ;StorageProvider = "OpenSim.Data.MSSQL.dll"
25 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
26
19[AssetService] 27[AssetService]
20 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 28 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
21 AssetLoaderArgs = "assets/AssetSets.xml" 29 AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/mssql_connection.ini.example b/bin/mssql_connection.ini.example
deleted file mode 100644
index e0ae7ba..0000000
--- a/bin/mssql_connection.ini.example
+++ /dev/null
@@ -1,18 +0,0 @@
1; The IniConfig.cs that parses this file by just finding the first key={value} in the whole text so comments aren't really honoured.
2; Also, this algorithm can probably lead to 'amusing' results in unfortunate cases.
3
4[mssqlconnection]
5data_source=\SQLEXPRESS
6initial_catalog=database
7persist_security_info=True
8user_id=username
9password=password
10
11; These entries are only for if you, for some reason, wish to customize your user server table names.
12; Do note that if you change the table names, you might have to change the sql resources too manually
13; If ommitted, default values will be used.
14
15userstablename=users
16userfriendstablename=userfriends
17agentstablename=agents
18regionstablename=regions