Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 1 | -14/+6 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -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-09 | 1 | -22/+4 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Add commented log lines to FetchInventoryDescendents2 path for future use. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -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 bigmerge | Melanie | 2011-12-08 | 1 | -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-07 | 1 | -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 messages | Melanie | 2011-12-07 | 1 | -0/+6 |
| | | |||||
* | | Fix up intersim give messaging | Melanie | 2011-12-07 | 1 | -1/+41 |
| | | |||||
* | | Fix task inventory giving | Melanie | 2011-12-07 | 3 | -41/+16 |
| | | |||||
* | | Remove harmless merge artefact | Melanie | 2011-12-06 | 1 | -1/+1 |
| | | |||||
* | | Adapt GodsModule to core changes | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | |||||
* | | Remove erroneous message about hyperlinks when entering an invalid region name | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | | | | | | | in map search. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 4 | -7/+7 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | | |||||
| * | | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 4 | -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 ↵ | Melanie | 2011-12-05 | 1 | -2/+2 |
|\ \ | | | | | | | | | | into bigmerge | ||||
| * | | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -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-03 | 2 | -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-02 | 1 | -100/+110 |
| | | | | | | | | where such requests are ignored. | ||||
* | | Strip CR from http responses and limit them to 2048 chars | Melanie | 2011-12-05 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 2 | -9/+13 |
|\ \ | |/ | |||||
| * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+1 |
| | | |||||
| * | Improve some of the debug help messages | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -3/+2 |
| | | |||||
| * | tabulate "show caps" output for easier readability | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -5/+10 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -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-24 | 1 | -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 bigmerge | Melanie | 2011-11-19 | 3 | -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-19 | 1 | -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 informative | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -5/+10 |
| | | |||||
| * | For TerrainModule.SaveToFile(), don't bother throwing the exception onwards ↵ | Justin Clark-Casey (justincc) | 2011-11-17 | 1 | -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-17 | 1 | -18/+32 |
| | | | | | | | | putting out a useful complaint message if we haven't for some reason | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 6 | -80/+177 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| * | Comment out the vebose logging on HGFriendsModule. | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -12/+11 |
| | | | | | | | | Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends | ||||
| * | Fix the build break | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -1/+1 |
| | | |||||
| * | Look up a homeURL only when it's not null, in addition to not being string.Empty | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -1/+1 |
| | | |||||
| * | Enable log message to tell us what type of url is being requested from a ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -3/+3 |
| | | | | | | | | user's homeurl | ||||
| * | Make tracked per scene thread names conform to the majorirty format. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -3/+6 |
| | | | | | | | | This is <thread-name> (<region-name>) | ||||
| * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -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-15 | 1 | -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 debugging | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+24 |
| | | |||||
| * | Add comments about trying to avoid synchronous work off the ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -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-15 | 1 | -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-15 | 2 | -15/+13 |
| | | | | | | | | RecacheFriends() to reflect their intended function | ||||
| * | refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -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-15 | 2 | -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-15 | 1 | -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-14 | 2 | -11/+31 |
| | |