ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-27 12:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,815 Commits 5 Branches 93 Tags
f317953290f7240768bf52238541663134ac76ea
Commit Graph

2530 Commits

Author SHA1 Message Date
Melanie
f317953290 Fix up intersim give messaging 2011-12-07 01:02:46 +01:00
Melanie
d6486fe14a Fix task inventory giving 2011-12-07 00:43:59 +01:00
Melanie
62d0a0cdbf Remove harmless merge artefact 2011-12-06 22:58:00 +01:00
Melanie
09c043fe52 Adapt GodsModule to core changes 2011-12-05 21:26:43 +01:00
Melanie
5b07370ec4 Remove erroneous message about hyperlinks when entering an invalid region name 
in map search.
 2011-12-05 21:26:06 +01:00
Melanie
bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Justin Clark-Casey (justincc)
af9ccfa15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-12-05 20:50:44 +00:00
Justin Clark-Casey (justincc)
4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead 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.
 2011-12-05 20:44:20 +00:00
Melanie
66f4ce354f Fix CHANGED_TEXTURE and CHANGED_COLOR. 2011-12-05 19:01:14 +00:00
Melanie
cc482ee865 Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge 2011-12-05 18:54:31 +00:00
Melanie
2a8a46a32d Fix CHANGED_TEXTURE and CHANGED_COLOR. 2011-12-05 18:32:40 +01:00
Melanie
5ab536a1e9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-05 17:10:51 +00:00
Melanie
3281b99362 Strip CR from http responses and limit them to 2048 chars 2011-12-05 15:57:47 +01:00
Justin Clark-Casey (justincc)
4919c60560 Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() 
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.
 2011-12-03 18:59:54 +00:00
Justin Clark-Casey (justincc)
054ebe8878 Stop some places where we're trying to reset animations in child agents where such requests are ignored. 2011-12-02 23:56:01 +00:00
Melanie
b60ff651a3 Merge branch 'master' into bigmerge 2011-12-01 12:16:59 +00:00
Justin Clark-Casey (justincc)
fa63054c4f On "show caps", stop excluding the seed cap but do exclude it elsewhere 2011-11-29 20:37:03 +00:00
Justin Clark-Casey (justincc)
658d02b5e9 Improve some of the debug help messages 2011-11-29 16:56:31 +00:00
Justin Clark-Casey (justincc)
d3a46b03bf tabulate "show caps" output for easier readability 2011-11-29 16:29:11 +00:00
Melanie
dc612d0f08 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-11-28 11:06:38 +00:00
Justin Clark-Casey (justincc)
bdcfd6afee Add disabled CrossBehaviour to pCampBot, which is designed to cross test 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.
 2011-11-24 17:35:33 +00:00
Melanie
bdb5ac96d9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-11-19 22:39:15 +00:00
Justin Clark-Casey (justincc)
2206e2fc96 Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for 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.
 2011-11-19 01:32:21 +00:00
Justin Clark-Casey (justincc)
726ca72c47 minor: Make HelloNeighbour messages more informative 2011-11-19 01:27:06 +00:00
Justin Clark-Casey (justincc)
9c928e9dc6 For TerrainModule.SaveToFile(), don't bother throwing the exception onwards after printing out the error, since this method is invoked by users. 
Still throwing the exception on the stream method since this invoked programatically
 2011-11-17 22:15:46 +00:00
Justin Clark-Casey (justincc)
352672eaf2 Make "terrain save" more friendly by telling the user if we have saved and putting out a useful complaint message if we haven't for some reason 2011-11-17 22:13:32 +00:00
Melanie
31736b1aac Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
e21949deaf Comment out the vebose logging on HGFriendsModule. 
Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
 2011-11-16 00:26:54 +00:00
Justin Clark-Casey (justincc)
9488b235d1 Fix the build break 2011-11-16 00:10:55 +00:00
Justin Clark-Casey (justincc)
33b1e385ec Look up a homeURL only when it's not null, in addition to not being string.Empty 2011-11-16 00:01:21 +00:00
Justin Clark-Casey (justincc)
92dff85afb Enable log message to tell us what type of url is being requested from a user's homeurl 2011-11-15 23:38:24 +00:00
Justin Clark-Casey (justincc)
31ffd5450b Make tracked per scene thread names conform to the majorirty format. 
This is <thread-name> (<region-name>)
 2011-11-15 23:34:28 +00:00
Justin Clark-Casey (justincc)
aea547cd11 fix build break on UserManagementModule. 
This also adds time since started to "show threads".  Unfortunately these two changes got mixed in.
 2011-11-15 23:24:51 +00:00
Justin Clark-Casey (justincc)
5b9fe4497d Do proper locking of UserManagementModule.m_UserCache when getting. 
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
 2011-11-15 23:12:41 +00:00
Justin Clark-Casey (justincc)
122304317c temporarily increasing logging in HGFriendsModule for debugging 2011-11-15 22:14:31 +00:00
Justin Clark-Casey (justincc)
828e4a5b09 Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another. 2011-11-15 20:26:42 +00:00
Justin Clark-Casey (justincc)
64784bc0cf remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead 2011-11-15 17:30:58 +00:00
Justin Clark-Casey (justincc)
430821d837 Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> RecacheFriends() to reflect their intended function 2011-11-15 16:12:35 +00:00
Justin Clark-Casey (justincc)
2b5b4ac167 refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to better reflect its actual function 2011-11-15 16:05:08 +00:00
Justin Clark-Casey (justincc)
50803dfe2c For clients that are entering a simulator from initial login, stop executing 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.
 2011-11-15 15:57:53 +00:00
Justin Clark-Casey (justincc)
8d0aaa359f refactor: Don't create a new UUID for passing uuids to client - UUIDs are structs are so not passed by reference (and they're immutable!) 2011-11-15 15:05:10 +00:00
Justin Clark-Casey (justincc)
89632f3ea8 Add test for removing a friendship. 2011-11-14 20:56:56 +00:00
Melanie
df35720cf5 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneViewer.cs
 2011-11-14 20:34:49 +00:00
Melanie
17f32b7773 Fix build break 2011-11-14 20:33:39 +00:00
Justin Clark-Casey (justincc)
e5ff7f389b Improved method doc for AddFriend() - it actually does set up a two-way relationship. 
Rename IFriendsModule.AddFriend() to AddFriendship()
 2011-11-14 20:31:16 +00:00
Melanie
afca742392 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
a64def8b73 minor: remove some mono compiler warnings 2011-11-14 18:16:14 +00:00
Justin Clark-Casey (justincc)
348d15707d Add test for adding a friend whilst online 2011-11-14 18:08:02 +00:00
Justin Clark-Casey (justincc)
de895ee54a Add very simple FriendsModuleTests.TestNoFriends() 2011-11-14 17:18:51 +00:00
Justin Clark-Casey (justincc)
ff36a1bc7b If a friends identifier which is too short is given to HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring(). 
This is to progress http://opensimulator.org/mantis/view.php?id=5789
 2011-11-14 16:06:06 +00:00