ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 09:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 106 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

70 Commits

Author SHA1 Message Date
Melanie
884c0e7bb1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-05-27 19:24:30 +01:00
Justin Clark-Casey (justincc)
7cceab1295 In remote QueryAccess, also receive the actual status (true|false) instead of always true no matter what the callee actually returned. 
This was due to two things
1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"].
But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what
2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result.
The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
 2012-05-25 01:41:00 +01:00
Justin Clark-Casey (justincc)
38ce9d45a5 Make ISimulationScene.GetScene() used the more efficient region id for lookup rather than the region handle. 2012-05-24 01:00:18 +01:00
Melanie
c0f70d17fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-03-14 11:33:51 +00:00
Diva Canto
5a09572393 Minor sanity check on simulation agent handler (content type) 2012-03-13 20:14:51 -07: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
bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +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)
10a23a823e Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages 
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
 2011-11-19 01:16:07 +00:00
Melanie
75d4956ee5 Merge branch 'master' into careminster-presence-refactor 2011-05-13 12:05:46 +01:00
Diva Canto
e9e4c009b4 This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil. 2011-05-11 20:44:03 -07:00
Diva Canto
7fa2489a6e Revert "Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs." 
This reverts commit 5548f83750.
 2011-05-11 13:15:27 -07:00
Diva Canto
af2e12d2b4 One more debug message. Don't use this unless your name is nebadon. 2011-05-11 10:43:50 -07:00
Diva Canto
5548f83750 Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs. 2011-05-11 10:21:42 -07:00
Melanie
c8b9558039 Also compress the actual fatpacks 2011-05-08 23:52:31 +01:00
Melanie
ade09d0fa1 Also compress the actual fatpacks 2011-05-08 23:23:33 +02:00
Melanie
e345f03895 Remove a spammy debug I left in. Disable TP cancel button at the point 
of no return.
 2011-05-08 22:05:33 +01:00
Melanie
1fbf4c8300 Remove a spammy debug I left in. Disable TP cancel button at the point 
of no return.
 2011-05-08 21:36:51 +02:00
Melanie
9688db2f68 Enable compressed (gzip) fatpack transfers. 2011-05-08 20:20:00 +01:00
Melanie
763666e2d6 Enable compressed (gzip) fatpack transfers. 2011-05-08 19:50:35 +02:00
Melanie
d1cf1fe3d7 Merge branch 'master' into careminster-presence-refactor 2011-04-30 14:37:37 +01:00
Diva Canto
9892e115cc Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. 2011-04-28 20:19:54 -07:00
Melanie
918c12c965 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 08:06:11 +00:00
Melanie
cfce0aa448 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 05:22:05 +01:00
Melanie
e2762a68b3 Merge branch 'master' into careminster-presence-refactor 2011-02-12 00:42:10 +00:00
Diva Canto
34bd41d186 Comment previous debug 2011-02-08 11:16:38 -08:00
Diva Canto
305c755cfb XFF header again -- debug. 2011-02-08 07:50:01 -08:00
Melanie
4e0b0f0f4c Fix a typo in the QUERYACCESS method name 2011-02-05 04:24:43 +00:00
Melanie
188d86998d Fix up QueryAccess to also check parcels 2011-01-28 04:09:04 +00:00
Melanie
657c14c5db Fix up QueryAccess to also check parcels 2011-01-28 03:07:25 +01:00
Melanie
11c742a5a8 Make bans work for teleport. Now teleport will complete block if the user 
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
 2011-01-27 02:16:41 +01:00
Melanie
6306578fcf Merge branch 'master' into careminster-presence-refactor 2011-01-18 01:28:50 +00:00
Diva Canto
479d72ac97 Account for some component along the way lower-casing the HTTP header keys. (XFF header issue) 2011-01-17 11:37:39 -08:00
Diva Canto
0aeb8981b2 Brute force debug for XFF issue 2011-01-17 11:19:20 -08:00
Diva Canto
66f99ae267 More debug messages to help track the XFF header problem. 2011-01-17 11:03:46 -08:00
Diva Canto
e80bcc0049 Improved debug messages to track what is going on with the XFF header 2011-01-09 16:52:41 -08:00
Melanie
4df1d25d23 Plumb a code path for the entity transfer module to ask a destination scene 
whether or not an agent is allowed there as a root agent.
 2010-12-09 01:55:32 +00:00
Melanie
f28dc77ab4 Plumb a code path for the entity transfer module to ask a destination scene 
whether or not an agent is allowed there as a root agent.
 2010-12-09 02:01:41 +01:00
Melanie
da6816c805 Merge branch 'master' into careminster-presence-refactor 2010-10-04 04:49:54 +01:00
Diva Canto
934ae03d44 Made the Gatekeeper proxy-able. 2010-10-03 20:35:26 -07:00
Melanie
e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Diva Canto
9fd9836841 Make User Agent Service and Login Service separable. 2010-09-04 16:39:03 -07:00
Melanie
f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Diva Canto
1955b79759 Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer. 2010-08-19 18:55:30 -07:00
Melanie
46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01:00
Diva Canto
b6264e60d3 Removed opportunity for exception in BaseHttpServer. (mantis #4825) 2010-06-30 06:35:22 -07:00
Diva Canto
3dbc736049 Addresses mantis #4789. Not really a fix, because the event is harmless anyway. Just shouldn't happen normally. 2010-06-27 13:23:51 -07:00
Melanie Thielker
ecc77e3886 Comment noisy "CONNECTION DEBUGGING" messages, because they push more 
important stuff off screen too fast. Clean this time
 2010-05-27 19:09:00 +01:00
Melanie Thielker
ac5373427f Comment noisy "CONNECTION DEBUGGING" messages, because they push more 
important stuff off screen too fast. Clean this time
 2010-05-27 20:08:12 +02:00