From ef3f6b4e63a49430bebbc929cb61d018a0a0d37c Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 24 May 2011 16:33:51 -0400
Subject: Revert "Make client event handlers for money only work on root
 agents"

This reverts commit a8913141c081202eb1f988901a4ac0988bbd72a2.

	Pulling this back until some testing under various money
	modules can be done. Need to be able to make purchases as
	a child agent.
---
 .../World/MoneyModule/SampleMoneyModule.cs         | 36 ++++------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs')

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 952e797..b84a34d 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -177,37 +177,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
                 scene.EventManager.OnClientClosed += ClientLoggedOut;
                 scene.EventManager.OnValidateLandBuy += ValidateLandBuy;
                 scene.EventManager.OnLandBuy += processLandBuy;
-                scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
             }
         }
 
-        void OnMakeRootAgent(ScenePresence presence)
-        {
-            // Do this only for root agents
-            // Some implementations register $$ for
-            // child agents, then that never goes away
-            // We will send a zero balance when they are
-            // made root.
-            //
-            // Modules overriding this should only deal with
-            // root agents as well.
-            //
-            IClientAPI client = presence.ControllingClient;
-
-            client.OnEconomyDataRequest += EconomyDataRequestHandler;
-            client.OnMoneyBalanceRequest += SendMoneyBalance;
-            client.OnRequestPayPrice += requestPayPrice;
-            client.OnObjectBuy += ObjectBuy;
-            client.OnLogout += ClientClosed;
-
-            client.SendMoneyBalance (UUID.Random(), true, new byte[0], 0);
-        }
-
-        void HandleSceneEventManagerOnMakeRootAgent (ScenePresence presence)
-        {
-
-        }
-
         public void RemoveRegion(Scene scene)
         {
         }
@@ -305,9 +277,13 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         private void OnNewClient(IClientAPI client)
         {
             GetClientFunds(client);
-            // Moved the event registrations to fire them when
-            // the agent becomes root
 
+            // Subscribe to Money messages
+            client.OnEconomyDataRequest += EconomyDataRequestHandler;
+            client.OnMoneyBalanceRequest += SendMoneyBalance;
+            client.OnRequestPayPrice += requestPayPrice;
+            client.OnObjectBuy += ObjectBuy;
+            client.OnLogout += ClientClosed;
         }
 
         /// <summary>
-- 
cgit v1.1