* Rex merge, SimpleApp

OpenSim/Region/Examples/SimpleApp/ComplexObject.cs

@@ -13,7 +13,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs

@@ -13,7 +13,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs

@@ -13,7 +13,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs

@@ -13,7 +13,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
@@ -47,6 +47,8 @@ namespace SimpleApp
 
         public event Action<IClientAPI> OnLogout;
         public event ObjectPermissions OnObjectPermissions;
+
+        public event MoneyTransferRequest OnMoneyTransferRequest;
         public event Action<IClientAPI> OnConnectionClosed;
 
         public event ImprovedInstantMessage OnInstantMessage;
@@ -56,6 +58,8 @@ namespace SimpleApp
         public event ModifyTerrain OnModifyTerrain;
         public event SetAppearance OnSetAppearance;
         public event AvatarNowWearing OnAvatarNowWearing;
+        public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
+        public event ObjectAttach OnObjectAttach;
         public event StartAnim OnStartAnim;
         public event StopAnim OnStopAnim;
         public event LinkObjects OnLinkObjects;
@@ -85,6 +89,9 @@ namespace SimpleApp
         public event MoveObject OnGrabUpdate;
         public event ViewerEffectEventHandler OnViewerEffect;
 
+        public event FetchInventory OnAgentDataUpdateRequest;
+        public event FetchInventory OnUserInfoRequest;
+        public event TeleportLocationRequest OnSetStartLocationRequest;
 
         public event UpdateShape OnUpdatePrimShape;
         public event ObjectExtraParams OnUpdateExtraParams;
@@ -108,6 +115,8 @@ namespace SimpleApp
         public event CreateInventoryFolder OnCreateNewInventoryFolder;
         public event UpdateInventoryFolder OnUpdateInventoryFolder;
         public event MoveInventoryFolder OnMoveInventoryFolder;
+        public event RemoveInventoryFolder OnRemoveInventoryFolder;
+        public event RemoveInventoryItem OnRemoveInventoryItem;
         public event FetchInventoryDescendents OnFetchInventoryDescendents;
         public event PurgeInventoryDescendents OnPurgeInventoryDescendents;
         public event FetchInventory OnFetchInventory;
@@ -147,6 +156,8 @@ namespace SimpleApp
         public event FriendActionDelegate OnApproveFriendRequest;
         public event FriendActionDelegate OnDenyFriendRequest;
         public event FriendshipTermination OnTerminateFriendship;
+        public event PacketStats OnPacketStats;
+        public event MoneyBalanceRequest OnMoneyBalanceRequest;
 
         public event ReceiveRexClientScriptCmd OnReceiveRexClientScriptCmd; // rex
         public event ObjectClickAction OnObjectClickAction; // rex
@@ -236,6 +247,11 @@ namespace SimpleApp
         {
         }
 
+        public virtual void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
+        {
+
+        }
+
         public virtual void SendKillObject(ulong regionHandle, uint localID)
         {
         }
@@ -243,6 +259,11 @@ namespace SimpleApp
         public virtual void SetChildAgentThrottle(byte[] throttle)
         {
         }
+        public byte[] GetThrottlesPacked(float multiplier)
+        {
+            return new byte[0];
+        }
+
         
         public virtual void SendAnimations(LLUUID[] animations, int[] seqs, LLUUID sourceAgentId)
         {
@@ -307,7 +328,7 @@ namespace SimpleApp
         {
         }
 
-        public virtual void SendTeleportFailed()
+        public virtual void SendTeleportFailed(string reason)
         {
         }
 
@@ -337,6 +358,10 @@ namespace SimpleApp
         {
         }
 
+        public virtual void SendDialog(string objectname, LLUUID objectID, LLUUID ownerID, string msg, LLUUID textureID, int ch, string[] buttonlabels)
+        {
+        }
+
         public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
                                                   PrimitiveBaseShape primShape, LLVector3 pos, uint flags,
                                                   LLUUID objectID, LLUUID ownerID, string text, byte[] color,
@@ -344,7 +369,13 @@ namespace SimpleApp
                                                   byte[] particleSystem, LLQuaternion rotation, byte clickAction)
         {
         }
-
+        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
+                                          PrimitiveBaseShape primShape, LLVector3 pos, uint flags,
+                                          LLUUID objectID, LLUUID ownerID, string text, byte[] color,
+                                          uint parentID,
+                                          byte[] particleSystem, LLQuaternion rotation, byte clickAction, byte[] textureanimation)
+        {
+        }
         public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
                                                 LLVector3 position, LLQuaternion rotation)
         {
@@ -401,7 +432,6 @@ namespace SimpleApp
         {
         }
 
-
         public void SendAlertMessage(string message)
         {
         }

OpenSim/Region/Examples/SimpleApp/MyWorld.cs

@@ -13,7 +13,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

OpenSim/Region/Examples/SimpleApp/Program.cs

@@ -13,7 +13,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
@@ -51,9 +51,9 @@ namespace SimpleApp
         private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll";
         private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
 
-        protected override LogBase CreateLog()
+        protected override ConsoleBase CreateConsole()
         {
-            return new LogBase(null, "SimpleApp", this, true);
+            return new ConsoleBase("SimpleApp", this);
         }
 
         protected override void Initialize()
@@ -64,12 +64,12 @@ namespace SimpleApp
 
             LocalAssetServer assetServer = new LocalAssetServer();
 
-            m_assetCache = new AssetCache(assetServer, m_log);
+            m_assetCache = new AssetCache(assetServer);
         }
 
         public void Run()
         {
-            StartLog();
+            StartConsole();
             StartUp();
 
             LocalInventoryService inventoryService = new LocalInventoryService();
@@ -88,12 +88,13 @@ namespace SimpleApp
             m_commsManager = localComms;
 
             LocalLoginService loginService =
-                new LocalLoginService(userService, "", localComms, m_networkServersInfo, false, false);
+                new LocalLoginService(
+                    userService, String.Empty, localComms, m_networkServersInfo, false);
             loginService.OnLoginToRegion += backendService.AddNewSession;
 
             m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
 
-            m_log.Notice(m_log.LineInfo);
+            m_console.Notice(m_console.LineInfo);
 
             IPEndPoint internalEndPoint =
                 new IPEndPoint(IPAddress.Parse("127.0.0.1"), (int) m_networkServersInfo.HttpListenerPort);
@@ -103,7 +104,7 @@ namespace SimpleApp
 
             UDPServer udpServer;
 
-            m_moduleLoader = new ModuleLoader(m_log, m_config);
+            m_moduleLoader = new ModuleLoader(m_config);
             m_moduleLoader.LoadDefaultSharedModules();
 
             Scene scene = SetupScene(regionInfo, out udpServer, false);
@@ -169,8 +170,8 @@ namespace SimpleApp
                 scene.AddEntity(fileObject);
             }
 
-            m_log.Notice("Press enter to quit.");
+            m_console.Notice("Press enter to quit.");
-            m_log.ReadLine();
+            m_console.ReadLine();
         }
 
         protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
@@ -181,12 +182,12 @@ namespace SimpleApp
             return
                 new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService,
                             m_assetCache, storageManager, m_httpServer,
-                            new ModuleLoader(m_log, m_config), true, false);
+                            new ModuleLoader(m_config), true, false);
         }
 
         protected override StorageManager CreateStorageManager(string connectionstring)
         {
-            return new StorageManager("OpenSim.DataStore.NullStorage.dll", "simpleapp.yap");
+            return new StorageManager("OpenSim.DataStore.NullStorage.dll", "simpleapp.yap", false);
         }
 
         protected override PhysicsScene GetPhysicsScene()
@@ -210,6 +211,8 @@ namespace SimpleApp
 
         private static void Main(string[] args)
         {
+            log4net.Config.XmlConfigurator.Configure();
+
             Program app = new Program();
 
             app.Run();

OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs

@@ -1,3 +1,31 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -8,9 +36,9 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTitle("SimpleApp")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
-[assembly : AssemblyCompany("Playahead AB")]
+[assembly : AssemblyCompany("OpenSimulator.org")]
 [assembly : AssemblyProduct("SimpleApp")]
-[assembly : AssemblyCopyright("Copyright © Playahead AB 2007")]
+[assembly : AssemblyCopyright("Copyright © OpenSimulator Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]