aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-042-0/+137
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding standard OpenSim header to source filesBlueWall2013-05-311-0/+27
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-301-0/+90
| |\
| | * UserProfilesBlueWall2013-05-301-0/+90
| | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
| * | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-301-0/+20
| |/ | | | | | | | | display of groups of animations (Equal(), ToString(), FromOSDArray(), ...). No functional change to animations.
* | Merge branch 'master' into careminsterMelanie2013-05-302-4/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-252-4/+4
| | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
| * This is an experimental patch that adds support for comparing textureMic Bowman2013-05-242-33/+67
| | | | | | | | | | | | | | | | | | | | hashes for the purpose of accurately responding to AgentTextureCached packets. There is a change to IClientAPI to report the wearbles hashes that come in through the SetAppearance packet. Added storage of the texture hashes in the appearance. While these are added to the Pack/Unpack (with support for missing values) routines (which means Simian will store them properly), they are not currently persisted in Robust.
* | Merge branch 'master' into careminsterMelanie2013-05-241-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * To further help with tracking down the apperance of too much "Unknown User" ↵Justin Clark-Casey (justincc)2013-05-211-1/+1
| | | | | | | | | | | | | | in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials) This is to help with http://opensimulator.org/mantis/view.php?id=6625
* | Merge branch 'master' into careminsterMelanie2013-05-113-3/+16
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-112-2/+16
| |\
| | * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| | |
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-2/+1
| | |
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-1/+33
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-082-0/+50
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-082-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+47
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+47
| |
* | Merge branch 'master' into careminsterMelanie2013-05-041-1/+6
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-031-1/+6
| | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618
* | Merge branch 'master' into careminsterMelanie2013-05-011-10/+10
|\ \ | |/ | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-011-10/+10
| | | | | | | | | | | | | | | | | | | | SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those. However, two changes have been made to stock 2.2.3. Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified. This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled. Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
* | Merge branch 'master' into careminsterMelanie2013-04-251-1/+1
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-1/+1
| | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-0/+5
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-101-0/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| | * If OpenSimulator is writing a PID file and finds the file already present on ↵Justin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-1/+1
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
| |\ \ | | |/
| | * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
| | |
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+15
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
|/ /
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+15
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-03-222-31/+51
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)2013-03-191-30/+48
| | | | | | | | | | | | | | | | AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
| * For the moment, disable the output of the 'scene' statistics in ↵Robert Adams2013-03-191-1/+3
| | | | | | | | | | | | | | SimExtraStatsCollector and thus for the command 'show stats' because it is ugly and most of the information is already output in the formatted printout that appears before.
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
|\ \ | |/
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus2013-03-161-3/+14
| | | | | | | | connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
* | Merge branch 'master' into careminsterMelanie2013-03-153-1/+28
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2013-03-142-11/+21
| | | | | | | | simulator logs, for debug purposes
| * Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)2013-03-141-0/+7
| | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
* | Merge branch 'master' into careminsterMelanie2013-03-144-4/+102
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * minor: Remove some mono compiler warnings in OpenSim.Framework.dllJustin Clark-Casey (justincc)2013-03-132-3/+3
| |
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-132-1/+99
| | | | | | | | | | | | | | | | | | This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
* | Merge branch 'avination' into careminsterMelanie2013-03-061-3/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-051-3/+2
| | |
| * | Revert "Push updates from keyframe directly to the front of the output queue ↵Melanie2013-02-121-2/+1
| | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-121-1/+2
| | | | | | | | | | | | than through the update system.
generated by cgit v1.1 at 2024-11-09 07:24:35 +0000