Commit Graph

20485 Commits (44255fdde2b797d00d5a526e24e17e8ba885acbe)

Author SHA1 Message Date
ubit 44255fdde2 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-01 15:10:32 +02:00
Melanie ef3166d4fe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-31 23:38:47 +02:00
Melanie e40e1dc9e6 Reverse a senseless change in the prioritizer. Why I would want avatars to render according to their camera position is beyond me. 2012-07-31 23:38:01 +02:00
ubit 3d7b469c60 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-30 03:20:29 +02:00
Melanie bd262fe3ed Correct StandUp position and rotation 2012-07-30 03:05:57 +02:00
Melanie 88d68e68c1 Return world rotation on llGetObjectDetails()'s OBJECT_ROT 2012-07-29 15:40:31 +02:00
Melanie 30784ab9e1 Fix an exception while outputting a log message 2012-07-29 15:12:03 +02:00
Melanie 659be9dd50 When controls are released by script, don't drop the permission to
retake them.
2012-07-29 15:11:39 +02:00
Melanie 729046e1ad See that if controls are taken, those are released before taking new ones 2012-07-29 15:10:12 +02:00
Melanie 9163cdd7c1 Bump number of URLs to 15000 per region 2012-07-29 15:09:42 +02:00
ubit 7f5ac795be Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-28 02:03:18 +02:00
Melanie 9f6236f5bf Implement the linefeed URL hack for ShoutCast and other services 2012-07-27 12:10:04 +02:00
Melanie be22e3599c Change the stair fudge factor so steps of 0.5m can be climbled to match inworldz claims and SL's realities 2012-07-27 03:24:45 +02:00
Melanie 0993af0871 Allow load and save of IAR without a password. The password must still be
present on the command line for compatibility, but is ignored.
Avination's IAR operations are administratively done and the staff doesn't
have the passwords of the users.
2012-07-24 11:38:30 +02:00
Melanie 9e00e2ddec Change attachment handling to remove object from the scene first as per
justincc's original work. Sample scripts before doing so. Also refactor some
crucial common code and eliminate parameters that were only ever used with
the same constant value.
2012-07-23 21:08:02 +02:00
ubit 23be64c132 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-23 20:18:07 +02:00
Melanie b1b3057adc Fix double-ping on logout by not sending a stop packet to the client
if the client told us it wants to log out in the first place.
2012-07-21 20:56:19 +02:00
Melanie 1598f9d179 Fix the order of operations on detach. The object must always be serialized
while still in the scene to avoid losing important script state.
DeleteSceneObject can not be called before doing this!
2012-07-20 16:45:24 +02:00
Melanie 0d595ab19e Merge branch 'ubitwork' into avination 2012-07-19 12:28:50 +02:00
Melanie ce8b9e6c57 Fix slow loading of task inventory 2012-07-19 12:27:36 +02:00
ubit 1c6e7de2dc Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-19 12:15:07 +02:00
UbitUmarov 0facebec40 Update ubitMesh primMesher with new Dahlia version on core ( reckick git
back)
2012-07-19 11:12:53 +01:00
UbitUmarov 5b68bff73b kick git 2012-07-19 11:10:23 +01:00
Melanie 4917637ce6 Fix llSameGroup to work according to specs 2012-07-18 14:30:40 +02:00
ubit 5f57efd078 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 10:48:36 +02:00
UbitUmarov 5874dfd342 fix PollServiceRequestManager 2012-07-17 09:47:20 +01:00
Melanie 0797736fba Merge branch 'ubitwork' into avination 2012-07-17 10:25:13 +02:00
Melanie b35f97db46 Replace PollServiceRequestManager with older version, add extra logging to
event exceptions to see call path leading up to it.
2012-07-17 10:21:12 +02:00
ubit d19555e7c5 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 06:46:51 +02:00
UbitUmarov 1ff498266c minor changes, removed extra parts physics updates on linking nonroot
prims
2012-07-17 05:25:34 +01:00
UbitUmarov f004db6572 fix our stats ( old schema ) 2012-07-17 03:45:16 +01:00
ubit 666a935272 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 04:10:35 +02:00
UbitUmarov cd0bf93e71 Merge branch 'avination' into ubitwork 2012-07-17 02:18:16 +01:00
ubit 1365fe07cd Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 02:41:58 +02:00
UbitUmarov 2b2dbec176 Merge branch 'avination' into ubitwork 2012-07-17 01:40:27 +01:00
ubit e925b0654d Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 02:07:21 +02:00
UbitUmarov d5f4fb7b50 Merge branch 'avination' into ubitwork 2012-07-17 00:54:23 +01:00
Melanie 130668057f Fix merge artefacts 2012-07-17 01:42:42 +02:00
ubit 05cca8c694 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-17 01:33:31 +02:00
UbitUmarov 0d3661fb5f UbitOde: remove useless water collider from active code. 2012-07-17 00:27:01 +01:00
Melanie 8204976fb4 Merge branch 'master' into careminster 2012-07-16 23:34:52 +01:00
Melanie 2a85372169 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-07-16 23:33:33 +01:00
Melanie 1c3b0da74a Revert "Fix script "Running" behavior"
A better solution using the already present flags must be found.

This reverts commit 6d3ee8bb39.
2012-07-16 23:31:55 +01:00
Justin Clark-Casey (justincc) c1667d39a6 refactor: factor out common code in WebStatsModule.OnMakeRootAgent() 2012-07-16 23:15:02 +01:00
Justin Clark-Casey (justincc) 217f47b0d5 In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list. 2012-07-16 23:09:48 +01:00
Justin Clark-Casey (justincc) ed14dac0a3 Stop warning about no session from ViewerStats if user teleports to another region in the same simulator that was not next to the source region.
This was because teleporting to the new region invoked the new session setup code before the agent was removed from the old region, which then invoked the session teardown code.
Now, we only invoke the teardown code if the region ID occupied by the agent being removed is the same as the one registered for the current session.
2012-07-16 23:03:23 +01:00
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