aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorCharles Krinke2008-06-19 20:57:00 +0000
committerCharles Krinke2008-06-19 20:57:00 +0000
commit838ffd779280115dee2d24ddd9531728d7426942 (patch)
tree753ce7e8d03e83898cf07cac2c85ca8a382b0a67 /OpenSim/Region/ClientStack
parent* Patch from Dahlia - 0001576: Exception of type 'System.OutOfMemoryException... (diff)
downloadopensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.zip
opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.tar.gz
opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.tar.bz2
opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.tar.xz
Mantis#1543. Thank you kindly, Jonc for a patch that:
Implements terrain bake from Region/Estate dialog and respects estate settings during terraforming
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b298578..3dddbfb 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -159,6 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
159 private RezObject handlerRezObject = null; //OnRezObject; 159 private RezObject handlerRezObject = null; //OnRezObject;
160 private GenericCall4 handlerDeRezObject = null; //OnDeRezObject; 160 private GenericCall4 handlerDeRezObject = null; //OnDeRezObject;
161 private ModifyTerrain handlerModifyTerrain = null; 161 private ModifyTerrain handlerModifyTerrain = null;
162 private BakeTerrain handlerBakeTerrain = null;
162 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply; 163 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
163 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables; 164 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
164 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData; 165 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
@@ -893,6 +894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
893 public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights; 894 public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
894 public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest; 895 public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
895 public event SetRegionTerrainSettings OnSetRegionTerrainSettings; 896 public event SetRegionTerrainSettings OnSetRegionTerrainSettings;
897 public event BakeTerrain OnBakeTerrain;
896 public event EstateRestartSimRequest OnEstateRestartSimRequest; 898 public event EstateRestartSimRequest OnEstateRestartSimRequest;
897 public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest; 899 public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
898 public event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest; 900 public event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
@@ -5846,6 +5848,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5846 handlerLandStatRequest(0, 0, 0, "", this); 5848 handlerLandStatRequest(0, 0, 0, "", this);
5847 } 5849 }
5848 break; 5850 break;
5851 case "terrain":
5852 if (((Scene)m_scene).ExternalChecks.ExternalChecksCanIssueEstateCommand(this.AgentId))
5853 {
5854 handlerBakeTerrain = OnBakeTerrain;
5855 if (handlerBakeTerrain != null)
5856 {
5857 handlerBakeTerrain(this);
5858 }
5859 }
5860 break;
5861
5849 default: 5862 default:
5850 m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket.ToString()); 5863 m_log.Error("EstateOwnerMessage: Unknown method requested\n" + messagePacket.ToString());
5851 break; 5864 break;