ubit
1d628ebaa3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-29 04:45:38 +02:00
UbitUmarov
38cdf77cef
in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing
2012-06-29 03:41:04 +01:00
Melanie
2870659b5c
Merge branch 'ubitwork' into avination
2012-06-29 04:03:24 +02:00
ubit
8ebc6e9090
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-29 02:20:54 +02:00
UbitUmarov
7ab8bc0a60
don't recoil attachments doing llRezObject()
2012-06-29 01:17:53 +01:00
Justin Clark-Casey (justincc)
0229e90dcc
Move update of the final optional ODE total frame stat inside the OdeLock rather than outside to avoid a very occasional race condition with the stat collection thread
2012-06-29 01:02:35 +01:00
UbitUmarov
58b4417140
Merge branch 'avination' into ubitwork
2012-06-29 01:00:38 +01:00
Justin Clark-Casey (justincc)
e420f815dc
refactor: rename _collisionEventPrim to m_collisionEventActors and _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents.
...
These dictionaries handle all actor types, not just physical prims.
2012-06-29 00:54:40 +01:00
Justin Clark-Casey (justincc)
1a7be7b00e
Fix a regression where we stopped removing avatars from collision event reporting on logout, rather than stopping clearing their collision events.
...
This occurred in b18c8c8
(Thu May 17 2012).
This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
2012-06-29 00:36:50 +01:00
Justin Clark-Casey (justincc)
0f6b7b6a41
If a link points to a non-existing item in FetchInventory caps, then don't try to add it to the return data rather than suffering an exception later on
2012-06-29 00:11:44 +01:00
Melanie
f0f928dce1
Merge branch 'ubitwork' into avination
2012-06-29 01:04:48 +02:00
Justin Clark-Casey (justincc)
f202c36106
Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in many, many log messages.
2012-06-29 00:03:22 +01:00
Melanie
0d26e271c9
stop chat being sent to child avs again.
2012-06-29 01:02:22 +02:00
Justin Clark-Casey (justincc)
bfa6896678
Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG directly instead of an item ID to then shuffle through attachments, saving CPU busywork.
...
Almost all callers already had the sog to hand.
Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
2012-06-28 23:31:23 +01:00
Justin Clark-Casey (justincc)
571fd966cb
Rather than iterating through all SOGs in the scene looking for the one that matches out fromItemID on detach, go through the agent's attachment sog list instead.
2012-06-28 23:01:12 +01:00
Justin Clark-Casey (justincc)
f263d6a910
Remove code that tried to delete an attachment back to inventory if RezSingleAttachmentFromInventoryInternal() returned null.
...
null would only ever be returned if the item couldn't be located within inventory and this would happen immediately.
In this case, derezzing wouldn't work anyway since there is no item to derez.
2012-06-28 22:48:49 +01:00
Melanie
a1a22a2f10
Revert "Mantis 5977 Corrections to llRegionSayTo"
...
This reverts commit 679da63da6
.
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2012-06-28 22:02:20 +01:00
Justin Clark-Casey (justincc)
972b0b52f9
If rest of first line after colon is blank then still warn about running in XEngine if engine specified does not exist.
...
This is to take account of situations where the user was intending to specify a script engine using colon using its default language.
This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
2012-06-28 21:30:36 +01:00
Melanie
498820a74f
Merge branch 'ubitwork' into avination
2012-06-28 22:06:02 +02:00
Melanie
c87f0ac226
Fix llRegionSayTo the right way
2012-06-28 21:23:42 +02:00
Melanie
8a03c153d5
Return NPC instead of AGENT in the detect parameters for touch, collision and
...
sensor.
2012-06-28 20:29:37 +02:00
ubit
46d1ea9e97
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-28 13:26:46 +02:00
UbitUmarov
29abb7d62a
reactivate physics raycasts on llCastRay() until it's clear what is its problem if any...
2012-06-28 12:20:55 +01:00
UbitUmarov
de10a16546
Merge branch 'avination' into ubitwork
2012-06-28 10:57:47 +01:00
Melanie
41a1903c60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-06-28 03:21:08 +01:00
Justin Clark-Casey (justincc)
25baa2d894
Avoid reporting false positives when a colon is in a comment in the first line of a script where the user was not trying to select a different script engine.
...
This works by only posting the "Selected engine unavailable" message if we're falling back on XEngine and the language is one handled by XEngine.
In cases where the language is not handled or not allowed, the user will still be notified by the later compiler error.
This avoids the overwhelming majority of false positives where the first line contains a : for other reasons (e.g. source control systems, vim settings, etc.)
Ultimately, I think it would be better to detect script language/engine with a mechanism that didn't just rely on : detection (e.g like #! in unix scripts).
2012-06-28 01:01:18 +01:00
Justin Clark-Casey (justincc)
f9769a9fcb
minor: reuse colon index calculation in XEngine.OnRezScript. The index if a colon is found on the first line will always be the same as for the whole script.
2012-06-28 00:37:23 +01:00
Justin Clark-Casey (justincc)
bb48060b44
Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTestCase.SetUp()
2012-06-27 00:50:36 +01:00
Justin Clark-Casey (justincc)
d043213317
refactor: Move ScenePresence <-> AgentData attachments copying code into AttachmentsModule.
2012-06-27 00:41:46 +01:00
Justin Clark-Casey (justincc)
5bec5bcf71
Automatically disable log4net before each regression test so that logging is confined to a single test if it's turned on.
...
This involves making test classes inherit from a common OpenSimTestCase.
This will be applied to more classes as required.
2012-06-27 00:01:51 +01:00
Justin Clark-Casey (justincc)
87ca820f9b
Replace "kill uuid" console command with the more consistent "delete object uuid", which was present in the last opensim release.
2012-06-26 23:28:48 +01:00
Justin Clark-Casey (justincc)
0b29877790
Fix output for help on some object region console commands
2012-06-26 23:15:15 +01:00
Melanie
625041f1db
Comment out a spammy message that will spew 4 lines for each request to a
...
nonexistent URL for http-in
2012-06-27 00:10:51 +02:00
Justin Clark-Casey (justincc)
97437feb06
Show region positions in "show regions" robust console command
2012-06-26 23:05:10 +01:00
Justin Clark-Casey (justincc)
2524517986
minor: correct GridService "show regions" cibsike cinnabd usage statement
2012-06-26 22:54:41 +01:00
Justin Clark-Casey (justincc)
99954c1498
refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of local variables
2012-06-26 22:53:08 +01:00
Justin Clark-Casey (justincc)
2b82c421ad
refactor: Use local attachment module variables instead of global m_attMod.
...
This also avoids confusion between tests where one sets up m_attMod and another accidentally uses it after failing to set one up itself.
2012-06-26 22:31:25 +01:00
Justin Clark-Casey (justincc)
4329cc7b8a
refactor: make m_presence a local variable in all AttachmentsModuleTests since it doesn't need to be global and some tests set up more than one sp
2012-06-26 22:21:54 +01:00
Justin Clark-Casey (justincc)
32a4ce94f0
Add regression test to check that attachments in source region are deleting when an agent teleports to a neighbouring region
2012-06-26 22:16:44 +01:00
Justin Clark-Casey (justincc)
340005c5bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-26 22:12:39 +01:00
Justin Clark-Casey (justincc)
4b6c3fd4bb
If crossing attachments into another region pre-fatpack, clone objects before changing properties to avoid hud display race condition with update threads.
...
This matches behaviour in fatpack crossing, where attachments are cloned before their properties are changed.
This only applies to crossings to simulators running code released before April 2011.
2012-06-26 21:06:47 +01:00
BlueWall
988112d446
Add stub for llCastRay
2012-06-26 15:15:25 -04:00
Melanie
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
Melanie
9a8de52940
Add an event to the poll service manager thread to allow starting it
...
when needed rather than once per second. That is just too slow!
2012-06-26 10:49:37 +02:00
Melanie
2548d15878
Disable physics raycast until it can be seen to. Fix distance calculation
...
for some results.
2012-06-26 10:48:52 +02:00
Melanie
2ea8d820b0
Correct a wrong error constant
2012-06-26 10:48:27 +02:00
Melanie
fcb34efa95
Prevent bad prim in the database from crashing the sim, list affected
...
ids and skip them.
2012-06-26 10:47:35 +02:00
Justin Clark-Casey (justincc)
1f22b29ca3
Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.
...
Use these for new "show regions" command rather than old cumbersome stuff.
2012-06-26 00:40:46 +01:00
Justin Clark-Casey (justincc)
5292b8b8be
Add "show regions" console command to ROBUST to show all regions currently registered.
...
Command is not added in standalone, which has its own version of "show regions" that can also show estate name
2012-06-26 00:34:37 +01:00
Justin Clark-Casey (justincc)
854f2a913c
Add "show region at" command to grid service to get the details of a region at a specific location. "show region" command becomes "show region name" to disambiguate
...
This is the same format as used by "show object name", etc.
"deregister region" also becomes "deregister region id"
2012-06-25 23:55:14 +01:00