aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Look up a homeURL only when it's not null, in addition to not being string.EmptyJustin Clark-Casey (justincc)2011-11-161-1/+1
| |
| * Enable log message to tell us what type of url is being requested from a ↵Justin Clark-Casey (justincc)2011-11-151-3/+3
| | | | | | | | user's homeurl
| * Make tracked per scene thread names conform to the majorirty format.Justin Clark-Casey (justincc)2011-11-151-3/+6
| | | | | | | | This is <thread-name> (<region-name>)
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-7/+8
| | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
| * Do proper locking of UserManagementModule.m_UserCache when getting.Justin Clark-Casey (justincc)2011-11-151-29/+57
| | | | | | | | | | | | | | | | This might help with [USER AGENT CONNECTOR]: new connector to () [USER AGENT CONNECTOR]: Unable to contact remote server for GetServerURLs [USER AGENT CONNECTOR]: Malformed Uri : Argument cannot be null. Parameter name: uriString
| * temporarily increasing logging in HGFriendsModule for debuggingJustin Clark-Casey (justincc)2011-11-151-1/+24
| |
| * Add comments about trying to avoid synchronous work off the ↵Justin Clark-Casey (justincc)2011-11-151-1/+4
| | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
| * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is ↵Justin Clark-Casey (justincc)2011-11-151-1/+0
| | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead
| * Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> ↵Justin Clark-Casey (justincc)2011-11-152-15/+13
| | | | | | | | RecacheFriends() to reflect their intended function
| * refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to ↵Justin Clark-Casey (justincc)2011-11-151-5/+5
| | | | | | | | better reflect its actual function
| * For clients that are entering a simulator from initial login, stop executing ↵Justin Clark-Casey (justincc)2011-11-152-7/+28
| | | | | | | | | | | | | | | | FriendsModule.FetchFriendslist() asychronously. Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated. Changing this to synchronous may improve issues where a user does not see friends as online even though they are. I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient.
| * refactor: Don't create a new UUID for passing uuids to client - UUIDs are ↵Justin Clark-Casey (justincc)2011-11-151-4/+6
| | | | | | | | structs are so not passed by reference (and they're immutable!)
| * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-142-11/+31
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-142-4/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
generated by cgit v1.1 at 2024-12-18 15:45:15 +0000