aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-231-0/+24
|\
| * Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
| | | | | | | | | | | | | | | | into a region that does not exist. This is particularly problematic for physical objects where the velocity continues to move them out of the region causing an infinite number of failed region crossings. The patch forces an object that fails a crossing to be non-physical and moves it back into the starting region.
* | Merge branch 'master' into careminsterMelanie2011-12-221-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are ↵Diva Canto2011-12-221-39/+32
| | | | | | | | passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
* | Merge branch 'master' into careminsterMelanie2011-12-191-11/+55
|\ \ | |/
| * Fix race condition where the appearance update timer could be stopped just ↵Justin Clark-Casey (justincc)2011-12-191-3/+6
| | | | | | | | | | | | after another thread had started it on QueueAppearanceSave() or *Send() However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
| * Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-8/+49
| | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | Merge branch 'master' into careminsterMelanie2011-12-183-5/+25
|\ \ | |/
| * Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-171-3/+9
| | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
| * Sends the consistent child agent position upon creation of the child agent ↵Diva Canto2011-12-161-1/+12
| | | | | | | | in other regions, as opposed to <128, 128, 70>
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-1/+4
| |
* | Merge branch 'master' into careminsterMelanie2011-12-141-2/+2
|\ \ | |/
| * In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵Justin Clark-Casey (justincc)2011-12-131-2/+2
| | | | | | | | | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-101-14/+6
| |
* | Merge branch 'master' into careminsterMelanie2011-12-101-21/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
| |
* | Merge branch 'master' into careminsterMelanie2011-12-091-0/+2
|\ \ | |/
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-091-0/+2
| | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-11/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-11/+6
| | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* | Fix intersim object give messagesMelanie2011-12-071-0/+6
| |
* | Fix up intersim give messagingMelanie2011-12-071-1/+41
| |
* | Fix task inventory givingMelanie2011-12-073-41/+16
| |
* | Remove harmless merge artefactMelanie2011-12-061-1/+1
| |
* | Adapt GodsModule to core changesMelanie2011-12-051-2/+2
| |
* | Remove erroneous message about hyperlinks when entering an invalid region nameMelanie2011-12-051-2/+2
| | | | | | | | in map search.
* | Merge branch 'master' into bigmergeMelanie2011-12-054-7/+7
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-051-2/+2
| |\
| | * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-2/+2
| | |
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-054-7/+7
| |/ | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-12-051-2/+2
|\ \ | | | | | | | | | into bigmerge
| * | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-2/+2
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-12-052-103/+109
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-032-5/+5
| | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected.
| * Stop some places where we're trying to reset animations in child agents ↵Justin Clark-Casey (justincc)2011-12-021-100/+110
| | | | | | | | where such requests are ignored.
* | Strip CR from http responses and limit them to 2048 charsMelanie2011-12-051-1/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-012-9/+13
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+1
| |
| * Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-3/+2
| |
| * tabulate "show caps" output for easier readabilityJustin Clark-Casey (justincc)2011-11-291-5/+10
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Add disabled CrossBehaviour to pCampBot, which is designed to cross test ↵Justin Clark-Casey (justincc)2011-11-241-1/+1
| | | | | | | | | | | | bots between neighbouring regions. Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
* | Merge branch 'master' into bigmergeMelanie2011-11-193-25/+42
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵Justin Clark-Casey (justincc)2011-11-191-1/+0
| | | | | | | | | | | | | | SendCreateChildAgent" message This is misleading since a simulator will call this method before successfully trying remote regions. Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
| * minor: Make HelloNeighbour messages more informativeJustin Clark-Casey (justincc)2011-11-191-5/+10
| |
| * For TerrainModule.SaveToFile(), don't bother throwing the exception onwards ↵Justin Clark-Casey (justincc)2011-11-171-1/+0
| | | | | | | | | | | | after printing out the error, since this method is invoked by users. Still throwing the exception on the stream method since this invoked programatically
| * Make "terrain save" more friendly by telling the user if we have saved and ↵Justin Clark-Casey (justincc)2011-11-171-18/+32
| | | | | | | | putting out a useful complaint message if we haven't for some reason
* | Merge branch 'master' into bigmergeMelanie2011-11-176-80/+177
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Comment out the vebose logging on HGFriendsModule.Justin Clark-Casey (justincc)2011-11-161-12/+11
| | | | | | | | Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
| * Fix the build breakJustin Clark-Casey (justincc)2011-11-161-1/+1
| |
generated by cgit v1.1 at 2025-01-23 02:04:02 +0000