1a57c65810
* Normalizing endlines so git stops complaining about them being inconsistent.
...
* People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy.
2010-10-13 20:26:46 -04:00
b44c894ba1
Merge branch 'master' of /var/git/opensim/
2010-10-13 15:50:03 -07:00
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
6e37e55063
Merge branch 'master' of /var/git/opensim/
2010-10-13 14:20:03 -07:00
aa60c4b129
fix build break
2010-10-13 22:18:57 +01:00
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01:00
cc8498a31a
Merge branch 'master' of /var/git/opensim/
2010-10-13 11:30:07 -07:00
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01:00
eeac2a9e6a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-13 18:41:52 +01:00
ccd5610997
Correctly update the LastSeen field
2010-10-13 18:41:09 +01:00
01728fb19e
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
...
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-10-13 18:40:33 +01:00
12c0a05ae7
Merge branch 'master' of /var/git/opensim/
2010-10-13 10:40:04 -07:00
d7c9bc3b1c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-13 10:39:01 -07:00
d890390ecf
Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements.
2010-10-13 10:38:34 -07:00
e96621b27f
Merge branch 'master' of /var/git/opensim/
2010-10-13 10:00:08 -07:00
a132edbdae
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-13 12:42:02 -04:00
14a0f4fe9b
*typical non-effectual commit to trigger a build
2010-10-13 12:40:21 -04:00
b4c718f93b
Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change
...
.ini.example ";;" format to normal ini format, since the defaults file
is not parsed that way.
2010-10-13 17:07:13 +01:00
e863c0052b
Merge branch 'master' of /var/git/opensim/
2010-10-13 08:20:07 -07:00
54a3b8e079
New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet.
2010-10-13 08:16:41 -07:00
3eb68c319e
change default next owner persm to mod/trans to match SL.
2010-10-13 08:24:18 +02:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
873e551bb3
Merge branch 'master' of /var/git/opensim/
2010-10-10 15:00:12 -07:00
0806d03780
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-10 22:08:54 +01:00
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
30f926aab6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-10 22:07:51 +01:00
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
2804c97a39
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:06:47 +01:00
c2971a6398
Add group invites to the list of messages that get offlined
2010-10-10 20:15:02 +02:00
1ee628c7d5
Merge branch 'master' of git@github.com:opensim/opensim
2010-10-09 11:06:33 -07:00
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
aeecdd1430
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-09 09:09:38 -07:00
78f6fe0b31
Added missing sections to StandaloneHypergrid.ini
2010-10-09 09:09:16 -07:00
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +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
4adada6fe4
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-07 23:47:39 -04: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
Teravus Ovares (Dan Olivares)