OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,731 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

20731 Commits (f71ed7eb79091de370800362f716d214dd27b03a)

Author SHA1 Message Date
UbitUmarov 40c6aef2e5 Merge branch 'avination' into ubitwork 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-16 22:30:54 +01:00
Melanie c256447f46 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-16 22:22:42 +01:00
Melanie 9e99d2036c Merge branch 'master' into careminster 2012-07-16 21:33:16 +01:00
SignpostMarv ee7478fa16 sending more user-friendly messages to the script error window rather than the thrown exceptions. 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-07-16 21:32:38 +01:00
Melanie 7b9c4d2826 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-16 21:32:10 +01:00
Melanie 12049e1120 Allow setting linked avatar positions from within a prim not the one sat on 2012-07-16 11:03:12 +02:00
UbitUmarov cbaf59e086 ** TEST ** put back corrected SetPrimParams for avatars, referenced to 
sitpart and not m_host.
 2012-07-16 01:47:50 +01:00
UbitUmarov 3149eca68f backkick git 2012-07-15 23:45:47 +01:00
UbitUmarov cdd03acffa just a kick git 2012-07-15 23:37:31 +01:00
UbitUmarov 15a1ad393c Merge branch 'avination' into ubitwork 2012-07-15 23:33:06 +01:00
UbitUmarov 0baa1b557a Merge branch 'avination' into ubitwork 2012-07-15 23:00:28 +01:00
UbitUmarov 2606484e45 Merge branch 'avination' into ubitwork 2012-07-15 22:53:05 +01:00
Melanie 668723fab3 Remove instrumentation and fix the message delivery issue 2012-07-15 23:01:58 +02:00
UbitUmarov 59b6473472 Merge branch 'avination' into ubitwork 2012-07-15 21:32:10 +01:00
Melanie b130dcea21 Testing changes and instrumentation 2012-07-15 22:28:47 +02:00
UbitUmarov 5f991d92c7 Merge branch 'avination' into ubitwork 2012-07-15 21:20:26 +01:00
Melanie 283df0610d Save packets received while the client is added and replay them later. 2012-07-15 21:45:06 +02:00
Melanie 8baf4dcc78 Reinstate older set rotation code for avatars since it works in all cases 2012-07-15 20:55:54 +02:00
Melanie a2d19b9703 Replace sit position and rotation code with older, working version 2012-07-15 20:48:47 +02:00
Melanie ec40c54509 Revert "Fix a sit rotation issue" 
This reverts commit 47f7cc9457.
 2012-07-15 20:48:32 +02:00
Melanie 47f7cc9457 Fix a sit rotation issue 2012-07-15 20:41:10 +02:00
Melanie 8b4f7604e6 Revert "Experimentally handle UseCircuitCode synchrnonously" 
This reverts commit e3fa73da96.
 2012-07-15 19:45:08 +02:00
UbitUmarov 1dc064981b Merge branch 'avination' into ubitwork 2012-07-15 17:57:48 +01:00
Melanie e3fa73da96 Experimentally handle UseCircuitCode synchrnonously 2012-07-15 17:17:59 +02:00
UbitUmarov 35a5a064b0 Merge branch 'avination' into ubitwork 2012-07-15 15:40:23 +01:00
Melanie ad75a4b50b Eliminate a spurious exception report when a https url is accessed with a wrong 
CN
 2012-07-15 12:28:58 +02:00
Melanie 07b7301c22 Make https work in the poll service manager 2012-07-15 11:21:01 +02:00
Melanie 6f7b5ef4cb Fix a double parenthesis typo 2012-07-15 02:24:01 +02:00
UbitUmarov 62df82b74d messing around... Let terrain and water have nullphysicsactors, let 
nullphyscisactors have a type water, ground or unknown (default). having
this removed geom to name mapping no longer needed. Made some more methods
comum to prims and characters acessible via PhysActor allowing for a more
uniform access. ...
 2012-07-15 00:50:00 +01:00
Melanie caef55a636 Set up https to work like http does in the poll handler 2012-07-15 01:05:04 +02:00
UbitUmarov a492b6f693 remove forgotten line... 2012-07-14 20:13:40 +01:00
UbitUmarov 1dca94c72f don't subscribe collision events for nonphysical parts only because of 
collision sounds. Let them be passive
 2012-07-14 20:10:38 +01:00
Melanie 95f2d86549 Reinstate sleeping because less CPU is preferred over reporting accuracy. 
Who needs accurate collisions when the sim lags and crashes?
 2012-07-14 09:13:27 +02:00
dahlia 5d3723a47f update PrimMesher.cs to dll version r72 which fixes some path errors in sliced linear prims. Addresses Mantis #6085 2012-07-13 21:22:15 -07:00
SignpostMarv 84b7ae2573 acting on feedback from justincc 2012-07-14 01:45:34 +01:00
SignpostMarv 423101b425 acting on feedback from justincc 2012-07-14 01:45:34 +01:00
SignpostMarv e3453dd9ca added in some extra variables, it sometimes thinks it is on the same parcel :( 
Signed-off-by: SignpostMarv <github@signpostmarv.name>
 2012-07-14 01:45:34 +01:00
SignpostMarv b6cd3b625e adding workaround for silent failure if position is outside the bounds of a region, implementing parcel prim count check. 
Signed-off-by: SignpostMarv <github@signpostmarv.name>
 2012-07-14 01:45:34 +01:00
SignpostMarv 8d59385eea Implementation of llSetRegionPos(). Does not implement failure on object entry/prim limit/access restrictions. 
Signed-off-by: SignpostMarv <github@signpostmarv.name>
 2012-07-14 01:45:34 +01:00
Justin Clark-Casey (justincc) ec6a195e40 When generating a Warp3D texture, set the detailTexture[i] variable on resize from the JPEG2000 original rather than only saving it to disk. 
This appears to be the cause of the warp 3d exception seen when starting a new region for the first time.
Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk.
Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
 2012-07-14 01:11:30 +01:00
UbitUmarov 72e2b94094 In collisions report linksets root parts to parts, and not all parts. 
Temporary suspend collision checks on full stopped bodies, until a better
away is found wake them, avoiding spurius collision end and start events.
Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
 2012-07-13 23:57:45 +01:00
UbitUmarov 39262f6232 missed fix on vehicle reference frame 2012-07-13 20:25:47 +01:00
UbitUmarov 5cfea5934b fix bad vehicle reference frame 2012-07-13 19:32:43 +01:00
Melanie 64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc) 2954ceccae Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 2012-07-13 01:08:49 +01:00
Justin Clark-Casey (justincc) 884d603cac Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding. 
This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
 2012-07-13 01:03:28 +01:00
Justin Clark-Casey (justincc) 9ccb578721 Don't cache regions data on the other unused LocalGridServiceConnector that the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. 
Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
 2012-07-13 00:44:00 +01:00
Justin Clark-Casey (justincc) d6f54b25cd Stop redundantly passing in the endpoint to the LLClientView constructor. 
This can always be retrieved via the LLUDPClient and is so done in various places already.
 2012-07-12 23:48:42 +01:00
Justin Clark-Casey (justincc) dda999a22c Remove IClientIPEndpoint client interface for now. 
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
 2012-07-12 23:43:02 +01:00
Justin Clark-Casey (justincc) 3b3d9967b1 Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint. 2012-07-12 23:29:57 +01:00