35f74ac4ee
Merge branch 'master' of /var/git/opensim/
2010-11-26 18:30:05 -08:00
2f3fcd4b72
Merge branch 'master' of /var/git/opensim/
2010-11-26 18:10:02 -08:00
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
3bfdc7c8de
Merge branch 'master' of /var/git/opensim/
2010-11-26 17:40:03 -08:00
0f52f90f9c
Merge branch 'master' of /var/git/opensim/
2010-11-26 17:30:05 -08:00
a8a8fb6e13
llVecNorm nant test
2010-11-27 01:29:55 +00:00
35c6bba6d7
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:29:01 +00:00
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
e0866faacc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-27 01:27:46 +00:00
a1ab2a2244
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:25:02 +00:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
b844fef58a
Merge branch 'master' of /var/git/opensim/
2010-11-26 17:00:05 -08:00
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
385a6c4b34
Convert the scope id in the im session id to a URL variable. Fixes offline
...
group notice attachments not working
2010-11-26 23:20:43 +01:00
f10aa2c887
Merge branch 'master' of /var/git/opensim/
2010-11-26 14:10:05 -08:00
7c02d5cec5
Another attempt at fixing failing test for creator info.
2010-11-26 23:04:31 +01:00
e30f61445f
Merge branch 'master' of /var/git/opensim/
2010-11-26 13:50:08 -08:00
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
6915edbf94
Merge branch 'master' of /var/git/opensim/
2010-11-26 03:30:10 -08:00
0bc5ffbe96
Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177 .
2010-11-26 11:50:51 +01:00
cccfd1db34
Add marker files to the restart module so external scripts can be used to
...
kill a process that hasn't restarted properly
2010-11-26 03:21:51 +01:00
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
33c023bf6a
Allow group lookup during tp / login to make restricting parcels to group
...
work.
2010-11-25 21:22:22 +01:00
ee9aca9c52
Add the ability for gods to impersonate users. For this, bit 6 needs to be
...
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
2010-11-25 20:34:55 +01:00
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
06d8f67448
Merge branch 'master' of /var/git/opensim/
2010-11-24 21:10:03 -08:00
e9d59389e8
Merge branch 'master' of /var/git/opensim/
2010-11-24 20:20:03 -08:00
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
d00405d3b8
Merge branch 'master' of /var/git/opensim/
2010-11-24 19:30:05 -08:00
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
c14592d4ba
Export the module interface for restart
2010-11-25 04:16:34 +01:00
efb03f6f99
Fix a bug caused by leftover code
2010-11-25 03:59:57 +01:00
e74b0deb4e
Fix up remote controller.
2010-11-25 03:43:23 +00:00
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +00:00
8fadfc4734
Merge branch 'master' of /var/git/opensim/
2010-11-24 18:30:32 -08:00
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
1522567920
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:37:50 +01:00
eb9d7bff6c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-25 01:25:56 +00:00
2c1c04119d
Merge branch 'master' into careminster-presence-refactor
2010-11-25 01:24:32 +00:00
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
181daf3a9d
Merge branch 'master' of /var/git/opensim/
2010-11-24 02:10:12 -08:00
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
a47fb93b74
Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim
2010-11-23 23:48:52 +01:00
a1daeb277e
Merge branch 'master' of /var/git/opensim/
2010-11-23 07:50:04 -08:00
a4bf6c5343
Attempt at fixing failing test.
2010-11-23 07:44:42 -08:00
cb2b1257e9
Merge branch 'master' of /var/git/opensim/
2010-11-23 07:20:16 -08:00
opensim mirror account