0259019431
fix merge
2017-12-30 15:50:03 +00:00
a7803409f6
clean some extra space chars
2017-12-30 15:46:32 +00:00
8032898773
mantis 8271: work around missing encoding of estate bans on the pseudo url encode used on POST, without changing the xml also used elsewhere. Possible this can be used in other case
2017-12-30 15:28:26 +00:00
f0fd15ccc9
add missing entry on prebuid.xml for mutelist service
2017-12-20 18:20:26 +00:00
3b141e6e6f
Merge branch 'master' into httptests
2017-12-14 05:37:07 +00:00
201c916670
add a missing return on a mesh decode error in ubOdemeshmerizer
2017-12-14 05:36:15 +00:00
17b79cec91
mantis 8255 update example_web.xml
2017-12-13 02:14:51 +00:00
b35a10e2be
mantis 8250: try to work around timing issues
2017-12-13 01:10:21 +00:00
ab0f866087
Merge branch 'master' into httptests
...
# Conflicts:
# prebuild.xml
2017-12-12 22:19:31 +00:00
d32debe618
commit what i did so far for core mutes module, befere i lose it
2017-12-11 23:58:27 +00:00
a95e286168
increase sample rate of WaitGetScenePresence()
2017-12-11 23:36:42 +00:00
1e3cb82756
move some sharable items out of Xmute to Framework; add another test mutelistmodule, ignore it
2017-11-17 01:30:39 +00:00
4150a616c5
try kick jenkins/nant 2
2017-11-16 18:45:01 +00:00
366cdac656
try kick jenkins/nant
2017-11-16 18:13:32 +00:00
2f13b68d4f
add missing part of mutes list protocol
2017-11-16 17:50:06 +00:00
d35ab8c86c
Donating the Avination Mute Module
...
This lived out-of-tree and therefore wasn't part of the big code
drop. It's classic Avination, tied to MySQL and a direct database
connection and I don't have the bandwidth to fix it to core methods.
However, it has all the strange mute logic that OpenSim was missing
and maybe someone can step up to make it work in an open grid context.
2017-11-14 12:12:07 +00:00
873d42005f
add AGENT_LIST_EXCLUDENPC bit mask option to llGetAgentList scope to exclude NPCs
2017-11-14 03:49:32 +00:00
98f90f4eed
Changing map tile colors This change also allows setting the water color, as well as the 4 colors for textured map tiles.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2017-11-13 20:43:16 +00:00
17c65d918a
Merge branch 'master' into httptests
2017-11-12 12:11:29 +00:00
6546ea6da6
mantis 8253: don't let attachments delete remove controls from viewers on crossings.
2017-11-12 12:00:03 +00:00
f2b54c8cf9
mantis 8200: move changes in PGSQL from last commit to a new transaction (13)
2017-11-12 09:16:32 +00:00
6a75b7c65e
PGSQL EstateStore create estate_settings_id SEQUENCE
...
Missing creation for estate_settings_id sequence causes first run
to fail unless manually added.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2017-11-12 09:07:09 +00:00
cdb7d506fd
Merge branch 'master' into httptests
2017-11-12 03:26:48 +00:00
eaa239eb06
add a warning in opensim.ini.example mute lists, about the fact viewers cache beening shared by all grids, and that can be confusing
2017-11-12 03:26:10 +00:00
ca4804b758
Merge branch 'master' into httptests
2017-11-12 03:18:02 +00:00
8e8108c78c
change opensim.ini.example mutes coments to express what our current code does
2017-11-12 03:16:40 +00:00
e0fd966186
off line module V2 must not sent a empty mutes list. That is mutes modules job (or let viewers use they cached entries if none)
2017-11-12 02:51:59 +00:00
fcb8b2a3c3
mantis 8260 fix script count on delete and remove redundantTriggerRemoveScript in 2 points
2017-11-08 09:10:56 +00:00
8eb9bc8b19
mantis 8263: recover the ignore of texture changes if only materialID changed. That should be done by respective cap (as before)
2017-11-08 06:51:55 +00:00
8479658cd0
remove a potencial (and silly) deadlock; let other texture parameters changes trigger Changed.TEXTURE event
2017-11-08 01:53:36 +00:00
56d2db3a18
Add a new experimental implementation of PGSQL FSAssets
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2017-11-03 05:10:37 +00:00
39d1426f27
Merge branch 'master' into httptests
2017-10-30 19:06:17 +00:00
5360a8fea4
mantis 8258: also limit mesh basic shape torus hole sizeY on (some) existent objects.
2017-10-30 18:56:05 +00:00
3fb61f4470
mantis 8258: change Mesh basic shape pathScaleY in case of Torus
2017-10-30 18:26:15 +00:00
16a8e166ff
Merge branch 'master' into httptests
2017-10-26 19:01:16 +01:00
6a5b234262
Fixed typo in a comment.
2017-10-26 13:43:36 -04:00
70d693eff2
Added missing Allow line for osGetSimulatorMemoryKB.
2017-10-26 13:42:54 -04:00
5cc41eee34
Sorted the groups of Allow statements by alphabetical order.
2017-10-26 13:40:59 -04:00
fbb2f7f319
Corrected name of function in call to CheckThreatLevel.
2017-10-26 13:29:14 -04:00
d65f055e4e
Whitespace cleanup.
2017-10-26 11:26:49 -04:00
f81375cf1e
mantis 8253: try to recover information about takecontrols pass=false controls on crossings, also tell viewers about them. this may still not be correct. Use of multiple TakeControls on same avatar can still give unpredictable results (also on normal operation). In same cases last executed my override previus or not. Also change agent updates wait code
2017-10-25 02:59:19 +01:00
c220c277e2
Merge branch 'master' into httptests
2017-10-15 23:03:39 +01:00
3d6553afee
add osGetSimulatorMemoryKB(). This allows work around the fact osGetSimulatorMemory() reports at most 2GB. This one limit is now 2TB, should ne enought for a while
2017-10-15 14:46:21 +01:00
68e9baf2e0
Merge branch 'master' into httptests
2017-10-13 20:36:29 +01:00
b51b4d4171
Merge branch 'master' of git://opensimulator.org/git/opensim (Ubit beat
...
me to the repository).
2017-10-13 12:04:52 -07:00
dd58f15bff
mantis 8249: give better data to llDetectedGrab
2017-10-13 20:00:38 +01:00
df3759e099
BulletSim: Add parameter "[BulletSim]AvatarWalkVelocityFactor=1.0" to
...
adjust the walking speed passed from the simulator. Default is 1.0f so
there should be no change for regions who do not change the factor.
The adjustment for walking speed and AlwaysRun speed should be in the
simulator and not the physics engines (who all assume TargetVelocity.set
is only used for avatar walking/running) but that would require tweaking
all the phyiscs engines.
2017-10-13 12:00:07 -07:00
59afeb6c4c
remove a dead line of code
2017-10-06 02:43:46 +01:00
8520ceed63
mantis 8246: don't allow 'delete object name' to delete attachments, but allow delete object id, with confirmation
2017-10-06 02:40:28 +01:00
b1814d3492
Merge branch 'master' into httptests
2017-10-01 18:05:10 +01:00
UbitUmarov