Talun
b8114d2b67
Add a version of osNpcSay that takes a channel number Mantis 5747
...
osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-26 16:13:29 -04:00
Justin Clark-Casey (justincc)
ca228c4770
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
2012-04-26 16:20:53 +01:00
Justin Clark-Casey (justincc)
f49912f92a
minor: Add more detail to unauthorized caps client message
2012-04-26 16:10:24 +01:00
Justin Clark-Casey (justincc)
b0cbf16c19
minor: Add region name to dropped inbound packet message
2012-04-26 16:04:49 +01:00
Justin Clark-Casey (justincc)
4c4ffb9868
Add request verb and url to error messages in WebUtil that lack this.
...
Make exception printing consistent across windows and mono.
2012-04-26 00:43:31 +01:00
Justin Clark-Casey (justincc)
e52fe03fff
minor: Add avatar name to removing agent log message
2012-04-26 00:42:37 +01:00
Justin Clark-Casey (justincc)
74dbfe6bb5
Comment out avatar move to target message for now.
2012-04-25 23:46:42 +01:00
Mic Bowman
133370f158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 11:57:29 -07:00
Mic Bowman
a2d544c938
Add a configuration switch to turn on/off the use of the trash
...
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior.
2012-04-25 11:54:57 -07:00
BlueWall
d76df3df79
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-25 14:39:11 -04:00
Melanie
88553bb884
Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990
2012-04-25 19:09:22 +01:00
BlueWall
a153a3cf3b
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-25 13:43:48 -04:00
Mic Bowman
1afae01311
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 09:52:44 -07:00
Mic Bowman
bec100a662
Add try/catch around Json script method registration to avoild some issues
...
with .NET 3.5 vs 4.0 differences.
See http://opensimulator.org/mantis/view.php?id=5971
2012-04-25 09:51:30 -07:00
BlueWall
cca3c5f66e
Fromatting output, cleanup
2012-04-25 10:50:33 -04:00
BlueWall
6fd803f24f
Some more handlers added/converted
2012-04-25 10:05:41 -04:00
BlueWall
32a70fb7e9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-25 08:47:17 -04:00
Diva Canto
7aa25c6762
Slight rewording of output messages.
2012-04-24 22:40:07 -07:00
Diva Canto
fd281ded3f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-24 22:17:52 -07:00
Diva Canto
cf1c34605b
HG: Moved User-level code down to the HGEntityTransferModule where it belongs.
2012-04-24 22:17:10 -07:00
BlueWall
38c0927707
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 23:24:51 -04:00
Melanie
550ff3b4da
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-25 04:01:55 +01:00
Melanie
3be3189ee0
Commit the avination Teleport() methods (adaptedto justincc's changes)
2012-04-25 04:00:01 +01:00
Justin Clark-Casey (justincc)
af86e2939c
zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment)
2012-04-25 03:47:26 +01:00
Justin Clark-Casey (justincc)
683cfc6f82
refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()
...
These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
2012-04-25 02:07:55 +01:00
Justin Clark-Casey (justincc)
a65ca24701
Add regression test TestSameRegionTeleport()
2012-04-25 01:51:40 +01:00
BlueWall
de4327bfd5
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 20:39:46 -04:00
Justin Clark-Casey (justincc)
f24289c47f
Comment out AvatarService.SetAvatar debug log line for now
2012-04-25 01:09:23 +01:00
Justin Clark-Casey (justincc)
6b299a4287
Comment out some debug ATTACHMENTS log messages for now.
2012-04-25 00:52:33 +01:00
Justin Clark-Casey (justincc)
39a6d7cab4
Comment out the noisier AVFACTORY log messages for now.
...
Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene.
2012-04-25 00:47:32 +01:00
BlueWall
bf0b0c9ad5
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 19:35:59 -04:00
BlueWall
578ec6cc26
Add OAuth support lib to provide authentication for endpoints
2012-04-24 19:26:44 -04:00
Justin Clark-Casey (justincc)
0f470326aa
Improve teleport log debug and error messages to tell us who is teleporting.
2012-04-25 00:19:38 +01:00
BlueWall
c0b2e64a90
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 18:16:06 -04:00
Justin Clark-Casey (justincc)
54d5ff6774
Go back to always using the local timezone for now - not all machines have US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control
...
Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments.
2012-04-24 23:00:50 +01:00
Justin Clark-Casey (justincc)
ef1668adb3
Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type."
...
This reverts commit d3a4d67a20
.
Accidentally committed this when I didn't mean to yet.
2012-04-24 21:42:32 +01:00
Oren Hurvitz
2f398231ac
Minor improvements to logging
...
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
2012-04-24 21:38:09 +01:00
BlueWall
3dc88c55a9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 16:00:37 -04:00
Oren Hurvitz
d3a4d67a20
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-24 20:52:18 +01:00
Oren Hurvitz
da5fd53702
Fixed problem with MySQL: it was possible for one thread to use an incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe.
2012-04-24 20:49:28 +01:00
Oren Hurvitz
c70e85a327
When reading a region, use null objects to represent NULL fields.
...
Previously NULL fields were converted to an empty string due to the use of ToString(). But if the field was an Int (e.g., "locZ"), then the subsequent attempt to convert an empty string to an int caused an exception. Now the field is null so we don't try to convert it, so there's no exception.
2012-04-24 20:46:31 +01:00
Oren Hurvitz
6011bfa5e3
OSSL: fixed the threat level check for osParseJSONNew
2012-04-24 20:41:29 +01:00
Justin Clark-Casey (justincc)
cbe889e10b
minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chiefly some break up of the long line.
2012-04-24 20:30:19 +01:00
Olivier van Helden and Gudule Lapointe (Speculoos.net)
0e3053e4c9
DST settings to match client default Pacific Time (mantis #5972 )
2012-04-24 20:22:34 +01:00
BlueWall
4d78837a3a
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 15:20:21 -04:00
Justin Clark-Casey (justincc)
c6f30e044b
Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom.
...
This occurred in 7a574be3fd
from Sat 21 Apr 2012.
This should fix collision detection.
Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
2012-04-24 20:15:10 +01:00
BlueWall
3750f329d1
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 02:29:43 -04:00
BlueWall
40828910e7
Plugin manager generic result for use by command line or rest interface
2012-04-24 02:27:23 -04:00
Diva Canto
fd27988978
Changed the Map-related messages from Info to Debug. They're debug messages.
2012-04-23 21:29:18 -07:00
Justin Clark-Casey (justincc)
6c21e15cb9
Add online/offline indicator to "friends show" region console command.
...
Improve output table formatting.
2012-04-24 00:32:01 +01:00