c2971a6398
Add group invites to the list of messages that get offlined
2010-10-10 20:15:02 +02:00
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01:00
96080dc492
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-09 01:05:05 +01:00
ed161020e2
minor: remove some mono compiler warnings
2010-10-09 01:46:29 +01:00
211ea5d521
Limit formatting of local console output to actual logging messages.
...
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
ff49a21eca
Fix a security relevant issue with take / take copy
2010-10-09 01:02:57 +02:00
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
4a0911bdbd
Guard against locking a nullref to avoid build break
2010-10-08 19:19:07 +01:00
5dcbbb726a
Change the order of actions to address a possible nullref
2010-10-08 18:40:13 +01:00
52dd547863
Make SendKillObject send multiple localIDs in one packet. This avoids the
...
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02:00
1e66f79a4e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-08 03:09:04 +01:00
0d9c94033d
move CacheSculptMaps ini flag to OpenSimDefaults.ini
...
comment it and change defailt to true to reflect code
2010-10-07 19:48:17 -07:00
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
12bc6a7414
Clarify the format comment at the top of OpenSim.ini.example
2010-10-08 03:08:05 +01:00
ba0afa53d3
Implement rezzing coalesced objects
2010-10-07 05:12:39 +02:00
9a5d0984a5
Fix autoreturn to not return zero objects
2010-10-07 02:16:36 +01:00
2db0ac74c7
Implement taking of coalesced objects.
...
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
2010-10-07 01:13:17 +02:00
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
42f76773a1
Plumb the path for multiple object deletes
2010-10-06 19:59:30 +02:00
ca50f6a82c
Merge branch 'master' into careminster-presence-refactor
2010-10-06 05:45:29 +01:00
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
9a1c8db443
Convert worldview to GET
2010-10-06 05:17:31 +01:00
1a47ec082e
Convert worldview to GET
2010-10-06 05:15:47 +02:00
b7586806cd
Merge branch 'master' into careminster-presence-refactor
2010-10-06 03:52:57 +01:00
623f57deb5
Change the URL /worldview to /worldview/<region id> to support multiregion
2010-10-06 03:51:55 +01:00
752b6a8764
Convert the BMP to a JPEG image and return it. This should be testable.
2010-10-06 03:40:55 +01:00
abfcd168fc
Add the parameter plumbing and image generation
2010-10-06 03:32:01 +01:00
17316170a5
Add WOrldView request handler and plumbing
2010-10-06 03:03:10 +01:00
7d62ab6a9e
Fix incorrect class name
2010-10-06 02:16:42 +01:00
ce89f08f6b
Add WorldView module skeleton
2010-10-06 02:06:50 +01:00
c97398575c
Convert the map image modules to new style modules
2010-10-06 01:42:18 +01:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
613bdb40bd
Remove sirikata project
2010-10-06 00:22:08 +01:00
7e6a047769
Remove defunct sirikata client stack
2010-10-06 00:20:41 +01:00
5d61323192
Add the view generating method to the image generator interface
2010-10-05 23:49:21 +01:00
b424af6187
Revert an accidental default value change
2010-10-05 23:06:29 +01:00
4a171af0cc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 22:57:05 +01:00
eb491d2c36
Patch to allow other cam angles. Not complete. Thanks, Antont.
2010-10-05 22:56:20 +01:00
07122614d5
Formatting cleanup.
2010-10-04 22:44:22 -04:00
ba0a19c228
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 02:12:35 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
eb17d581d3
Make windlight set the default environment on start
2010-10-05 01:54:15 +01:00
eeca0ee009
Formatting cleanup.
2010-10-04 17:10:07 -04:00
e55e93c994
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:28 +01:00
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01:00
0e7e92b67f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-04 04:49:09 +01:00
37231e0941
Made the home agent handler check for xff if behind a proxy.
2010-10-03 21:21:02 -07:00
67cfde3fb4
Added Meshmerizer rendering plugin for libomv
2010-10-04 04:48:42 +01:00
adc3cfdcdc
Removed linden renderer
2010-10-04 04:44:33 +01:00
Melanie