standardization of datamanager constructors

pyogp/lib/base/agent.py

@@ -18,6 +18,7 @@ from pyogp.lib.base.inventory import *
 from pyogp.lib.base.groups import *
 from pyogp.lib.base.event_system import *
 from pyogp.lib.base.appearance import *
+from pyogp.lib.base.assets import *
 
 # pyogp messaging
 from pyogp.lib.base.message.message_handler import MessageHandler
@@ -91,7 +92,7 @@ class Agent(object):
         self.inventory = None
         self.start_location = None
         self.group_manager = GroupManager(self, self.settings)
-
+        self.assets = AssetManager(self, self.settings)
 
         # additional attributes
         self.login_response = None
@@ -125,7 +126,7 @@ class Agent(object):
         self.region = None          # the host simulation for the agent
 
         # init AppearanceManager()
-        self.appearance = AppearanceManager(self.settings, self)
+        self.appearance = AppearanceManager(self, self.settings)
 
         # Cache of region name->handle; per-agent to prevent information leaks
         self.region_name_map = {}

pyogp/lib/base/appearance.py

@@ -28,12 +28,12 @@ class AppearanceManager(DataManager):
     Tests: 
     """
 
-    def __init__(self, settings = None, agent = None):
+    def __init__(self, agent, settings = None):
         """
         initialize the appearance manager
         TODO Fix the Z by generating actual height
         """
-        super(AppearanceManager, self).__init__(settings, agent)
+        super(AppearanceManager, self).__init__(agent, settings)
         self.AgentSetSerialNum = 1
         self.AgentCachedSerialNum = 1
         self.wearables = [] #indexed by WearableType

pyogp/lib/base/assets.py

@@ -28,8 +28,8 @@ class AssetManager(DataManager):
     Tests: 
     """
 
-    def __init__(self, settings = None, agent = None):
-        super(AssetManager, self).__init__(settings, agent)
+    def __init__(self, agent, settings = None):
+        super(AssetManager, self).__init__(agent, settings)
         self.requests = [] # queue of requests?
         self.assets = {} # indexed by assetID?
 

pyogp/lib/base/datamanager.py

@@ -10,7 +10,7 @@ from pyogp.lib.base.message.message_handler import MessageHandler
 from pyogp.lib.base.exc import NotImplemented
 
 class DataManager(object):
-    def __init__(self, settings, agent):
+    def __init__(self, agent, settings):
         # allow the settings to be passed in
         # otherwise, grab the defaults
         if settings != None:

pyogp/lib/base/groups.py

@@ -36,7 +36,7 @@ class GroupManager(DataManager):
 
     def __init__(self, agent, settings = None):
         """ initialize the group manager """
-        super(GroupManager, self).__init__(settings, agent)
+        super(GroupManager, self).__init__(agent, settings)
         # the group store consists of a list
         # of Group() instances
         self.group_store = []

pyogp/lib/base/inventory.py

@@ -35,7 +35,7 @@ class InventoryManager(DataManager):
 
     def __init__(self, agent = None, settings = None):
         """ set up the inventory manager """
-        super(InventoryManager, self).__init__(settings, agent)
+        super(InventoryManager, self).__init__(agent, settings)
         # For now, store the inventory contents in a list
         #     of folders with it's contents list containing it's inventory items
         # Ditto the library

pyogp/lib/base/objects.py

@@ -38,7 +38,7 @@ class ObjectManager(DataManager):
 
     def __init__(self, agent = None, region = None, settings = None, message_handler = None, events_handler = None):
         """ set up the object manager """
-        super(ObjectManager, self).__init__(settings, agent)
+        super(ObjectManager, self).__init__(agent, settings)
         self.region = region
 
         # the object store consists of a list

pyogp/lib/base/parcel.py

@@ -54,9 +54,9 @@ log = logger.log
 class ParcelManager(DataManager):
     """ a parcel manager, generally used as an attribute of a region """
 
-    def __init__(self, region = None, agent = None, message_handler = None, events_handler = None, settings = None):
+    def __init__(self, agent = None, region = None, settings = None, message_handler = None, events_handler = None):
         """ initialize the parcel manager """
-        super(ParcelManager, self).__init__(settings, agent)
+        super(ParcelManager, self).__init__(agent, settings)
         
         self.region = region
 

pyogp/lib/base/region.py

@@ -124,7 +124,7 @@ class Region(object):
 
         self.objects = ObjectManager(agent = self.agent, region = self, settings = self.settings, message_handler = self.message_handler, events_handler = self.events_handler)
         
-        self.parcel_manager = ParcelManager(region = self, agent = self.agent, message_handler = self.message_handler, events_handler = self.events_handler, settings = None)
+        self.parcel_manager = ParcelManager(agent = self.agent, region = self, settings = self.settings, message_handler = self.message_handler, events_handler = self.events_handler)
         
 
         # required packet handlers