aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* try external bakedModule when local cache is invalid and not just at loginUbitUmarov2014-08-141-9/+13
|
* reduced debug msgsUbitUmarov2014-08-141-3/+7
|
* only try external baked texture module on loginUbitUmarov2014-08-141-26/+36
|
* *DANGER* make baked textures cross and make use of it * UNTESTED *UbitUmarov2014-08-141-95/+92
| | | | issue: alll this seems to be sent back to childs, need to stop that
* put back baked textures debug msgs at start of validatebaked...UbitUmarov2014-08-131-0/+12
|
* remove confusing defonly controlUbitUmarov2014-08-111-14/+4
|
* ... one day..UbitUmarov2014-08-111-1/+2
|
* will get there..UbitUmarov2014-08-111-4/+3
|
* validatebaked still not okUbitUmarov2014-08-111-5/+4
|
* of course.. bug..UbitUmarov2014-08-081-1/+2
|
* lock set appearence during ValidateBakedTextureCache there seems to be aUbitUmarov2014-08-081-93/+97
| | | | overlap in same cases
* bugUbitUmarov2014-08-071-1/+2
|
* remove annoying debug msg . still a lot of spam, but to remove laterUbitUmarov2014-08-071-1/+1
|
* make grid baked textures override the ones on appearance. Due to bugUbitUmarov2014-08-071-35/+60
| | | | | | somewhere they are always bad at ValidateBakedTextures entry. ( even if they where good and on assets cache we whould need to generate the cacheID hash )
* bug on upload new bakes decisionUbitUmarov2014-08-071-2/+3
|
* minor clean, dont check for cache if we aren't using it..UbitUmarov2014-08-071-23/+5
|
* bugUbitUmarov2014-08-071-1/+1
|
* only send to bakedmodule the baked textures :)UbitUmarov2014-08-071-10/+13
|
* buggUbitUmarov2014-08-071-28/+26
|
* DANGER... changed bakedtextures caching. Assuming grid baking is cacheUbitUmarov2014-08-071-81/+198
| | | | only, reduced number of accesses to it. TESTING
* local chat gods bug fixUbitUmarov2014-08-041-2/+2
|
* remove debug msgs at attachments deRezUbitUmarov2014-08-031-7/+1
|
* buggUbitUmarov2014-08-031-11/+15
|
* dont get script states for NPCs on deRezUbitUmarov2014-08-031-8/+11
|
* replace debug msgs by othersUbitUmarov2014-08-031-1/+12
|
* god also read local chatUbitUmarov2014-08-021-1/+6
|
* filter local chat from avatars or attachment acording to parcel hide (UbitUmarov2014-08-011-3/+34
| | | | not fully tested)
* Fix duplicate attach message being sent to objects picked up from the groundMelanie Thielker2014-07-201-1/+4
|
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2119-188/+2241
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' into careminsterMelanie2014-01-281-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-2/+2
| | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
| * | Intermediate commit. Sill errors.Melanie2014-01-051-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * Fix issue with editing notes for other avatarsBlueWall2013-12-161-2/+2
| | |
| | * Committing the Avination Scene Presence and related texture codeMelanie2013-12-112-90/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
| * | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-67/+0
| | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| * | Merge branch 'master' into careminsterMelanie2013-12-071-0/+67
| |\ \ | | |/
| | * Add support for user preferences (im via email)BlueWall2013-12-061-0/+67
| | |
| * | Merge branch 'master' into careminsterMelanie2013-11-232-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * minor: Use default(UUID) in rez attachment failure error logging rather than ↵Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | (UUID)null Patch from http://opensimulator.org/mantis/view.php?id=6843 Thanks Kira.
| | * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
| | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| * | Merge branch 'master' into careminsterMelanie2013-11-031-2/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * * Refactorteravus2013-10-071-2/+2
| | | | | | | | | | | | * Break out common BasicDOSProtector code into separate class.
| | * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-061-1/+2
| |\ \ | | | | | | | | | | | | careminster
| | * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| * | | Merge branch 'master' into careminsterMelanie2013-10-061-0/+36
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, ↵Diva Canto2013-10-041-0/+37
| | | | | | | | | | | | shout-range, at the request of Singularity dev Liru-Dargon
| * | Merge branch 'master' into careminsterMelanie2013-10-045-7/+35
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-272-2/+2
| | | | | | | | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| | * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)